Files
@ r27870:7c06e9e1a86b
Branch filter:
Location: cpp/openttd-patchpack/source/src/story_type.h - annotation
r27870:7c06e9e1a86b
1.2 KiB
text/x-c
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.
r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r27737:728d55b97775 r27737:728d55b97775 r20329:0b11d054e50d r20329:0b11d054e50d r26117:dec8ad7628ec r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d r20329:0b11d054e50d | /*
* 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/>.
*/
/** @file story_type.h basic types related to story pages */
#ifndef STORY_TYPE_H
#define STORY_TYPE_H
#include "core/enum_type.hpp"
typedef uint16_t StoryPageElementID; ///< ID of a story page element
typedef uint16_t StoryPageID; ///< ID of a story page
struct StoryPageElement;
struct StoryPage;
enum StoryPageElementType : byte;
static const StoryPageElementID INVALID_STORY_PAGE_ELEMENT = 0xFFFF; ///< Constant representing a non-existing story page element.
static const StoryPageID INVALID_STORY_PAGE = 0xFFFF; ///< Constant representing a non-existing story page.
#endif /* STORY_TYPE_H */
|