Files
@ r27870:7c06e9e1a86b
Branch filter:
Location: cpp/openttd-patchpack/source/bin/ai/compat_1.10.nut - annotation
r27870:7c06e9e1a86b
945 B
text/plain
Fix: asserts unintentially being partially disabled in release-builds (#11268)
The nlohmann-json header file includes assert.h, which rudely resets
the assert macro to what that header thinks is right. As we set the
assert macro to be active with release builds when WITH_ASSERT is
active, this means that every file including nlohmann-json has their
asserts disabled (for release-builds) but files that don't do no.
Let's avoid this issue, by telling nlohmann to not include assert.h.
The nlohmann-json header file includes assert.h, which rudely resets
the assert macro to what that header thinks is right. As we set the
assert macro to be active with release builds when WITH_ASSERT is
active, this means that every file including nlohmann-json has their
asserts disabled (for release-builds) but files that don't do no.
Let's avoid this issue, by telling nlohmann to not include assert.h.
r23397:3e09f9e42e43 r23397:3e09f9e42e43 r23397:3e09f9e42e43 r23397:3e09f9e42e43 r23397:3e09f9e42e43 r23397:3e09f9e42e43 r24096:cb8e221271af r24096:cb8e221271af r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb r26435:b03b1a6191cb | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
AILog.Info("1.10 API compatibility in effect.");
/* 13 really checks RoadType against RoadType */
AIRoad._HasRoadType <- AIRoad.HasRoadType;
AIRoad.HasRoadType <- function(tile, road_type)
{
local list = AIRoadTypeList(AIRoad.GetRoadTramType(road_type));
foreach (rt, _ in list) {
if (AIRoad._HasRoadType(tile, rt)) {
return true;
}
}
return false;
}
|