diff options
| author | Dan Engelbrecht <[email protected]> | 2025-06-23 09:42:24 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-06-23 09:42:24 +0200 |
| commit | a0b2ecc4af7e5a167f43d87a3f660c961625ea51 (patch) | |
| tree | a82e9ffa4ae5fb25b5726390765caaee053edef1 /thirdparty/Oodle/include/oodle2base.h | |
| parent | move nodiscard to proper location (#447) (diff) | |
| download | zen-a0b2ecc4af7e5a167f43d87a3f660c961625ea51.tar.xz zen-a0b2ecc4af7e5a167f43d87a3f660c961625ea51.zip | |
update Oodle libs to 2.9.14 (#446)
* update Oodle libs to 2.9.14
Diffstat (limited to 'thirdparty/Oodle/include/oodle2base.h')
| -rw-r--r-- | thirdparty/Oodle/include/oodle2base.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/thirdparty/Oodle/include/oodle2base.h b/thirdparty/Oodle/include/oodle2base.h index 05f73f3ea..0f5f99025 100644 --- a/thirdparty/Oodle/include/oodle2base.h +++ b/thirdparty/Oodle/include/oodle2base.h @@ -1,7 +1,7 @@ //=================================================== // Oodle2 Base header -// (C) Copyright 1994-2021 Epic Games Tools LLC +// (C) Copyright 1994-2025 Epic Games Tools LLC //=================================================== #ifndef __OODLE2BASE_H_INCLUDED__ @@ -23,7 +23,7 @@ #include <stdint.h> -#define OOCOPYRIGHT "Copyright (C) 1994-2021, Epic Games Tools LLC" +#define OOCOPYRIGHT "Copyright (C) 1994-2025, Epic Games Tools LLC" // Typedefs typedef int8_t OO_S8; @@ -97,13 +97,17 @@ typedef int32_t OO_BOOL; // simple compiler assert // this happens at declaration time, so if it's inside a function in a C file, drop {} around it #ifndef OO_COMPILER_ASSERT - #if defined(__clang__) - #define OO_COMPILER_ASSERT_UNUSED __attribute__((unused)) // hides warnings when compiler_asserts are in a local scope - #else - #define OO_COMPILER_ASSERT_UNUSED - #endif - - #define OO_COMPILER_ASSERT(exp) typedef char OO_NUMBERNAME(_dummy_array) [ (exp) ? 1 : -1 ] OO_COMPILER_ASSERT_UNUSED + #if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L) + #define OO_COMPILER_ASSERT(exp) static_assert(exp, "Assert " #exp) + #else + #if defined(__clang__) + #define OO_COMPILER_ASSERT_UNUSED __attribute__((unused)) // hides warnings when compiler_asserts are in a local scope + #else + #define OO_COMPILER_ASSERT_UNUSED + #endif + + #define OO_COMPILER_ASSERT(exp) typedef char OO_NUMBERNAME(_dummy_array) [ (exp) ? 1 : -1 ] OO_COMPILER_ASSERT_UNUSED + #endif #endif |