BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-30 10:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved function to namespace (#8068)

Browse Source
This commit is contained in:
Artem Shilkin
2023-09-29 17:50:06 +03:00
committed by GitHub
parent c5441dc199
commit bcb9ef1876
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/flatbuffers/base.h
View File

@@ -289,10 +289,12 @@ namespace flatbuffers {
#define FLATBUFFERS_SUPPRESS_UBSAN(type) #define FLATBUFFERS_SUPPRESS_UBSAN(type)
#endif #endif
// This is constexpr function used for checking compile-time constants. namespace flatbuffers {
// Avoid `#pragma warning(disable: 4127) // C4127: expression is constant`. // This is constexpr function used for checking compile-time constants.
template<typename T> FLATBUFFERS_CONSTEXPR inline bool IsConstTrue(T t) { // Avoid `#pragma warning(disable: 4127) // C4127: expression is constant`.
return !!t; template<typename T> FLATBUFFERS_CONSTEXPR inline bool IsConstTrue(T t) {
return !!t;
}
} }
// Enable C++ attribute [[]] if std:c++17 or higher. // Enable C++ attribute [[]] if std:c++17 or higher.

2
src/idl_parser.cpp
View File

@@ -2118,7 +2118,7 @@ CheckedError Parser::ParseSingleValue(const std::string *name, Value &e,
auto match = false; auto match = false;
#define IF_ECHECK_(force, dtoken, check, req) \ #define IF_ECHECK_(force, dtoken, check, req) \
if (!match && ((dtoken) == token_) && ((check) || IsConstTrue(force))) \ if (!match && ((dtoken) == token_) && ((check) || flatbuffers::IsConstTrue(force))) \
ECHECK(TryTypedValue(name, dtoken, check, e, req, &match)) ECHECK(TryTypedValue(name, dtoken, check, e, req, &match))
#define TRY_ECHECK(dtoken, check, req) IF_ECHECK_(false, dtoken, check, req) #define TRY_ECHECK(dtoken, check, req) IF_ECHECK_(false, dtoken, check, req)
#define FORCE_ECHECK(dtoken, check, req) IF_ECHECK_(true, dtoken, check, req) #define FORCE_ECHECK(dtoken, check, req) IF_ECHECK_(true, dtoken, check, req)

2
tests/test_assert.h
View File

@@ -13,7 +13,7 @@
#define FLATBUFFERS_NO_FILE_TESTS #define FLATBUFFERS_NO_FILE_TESTS
#else #else
#define TEST_OUTPUT_LINE(...) \ #define TEST_OUTPUT_LINE(...) \
do { printf(__VA_ARGS__); printf("\n"); } while(!IsConstTrue(true)) do { printf(__VA_ARGS__); printf("\n"); } while(!flatbuffers::IsConstTrue(true))
#endif #endif
#define TEST_EQ(exp, val) TestEq(exp, val, "'" #exp "' != '" #val "'", __FILE__, __LINE__, "") #define TEST_EQ(exp, val) TestEq(exp, val, "'" #exp "' != '" #val "'", __FILE__, __LINE__, "")