gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build error under non-Clang compilers

Browse Source
This commit is contained in:
Charles Milette 2019-07-25 16:55:34 -04:00
parent d5d7171f6d
commit 07e1d7870a
No known key found for this signature in database
GPG Key ID: 1A5AE81377AD973A
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rapidjson/internal/clzll.h
View File

@ -29,7 +29,7 @@
RAPIDJSON_NAMESPACE_BEGIN
namespace internal {
#if defined(__has_builtin) && __has_builtin(__builtin_clzll)
#if (defined(__GNUC__) && __GNUC__ >= 4) || RAPIDJSON_HAS_BUILTIN(__builtin_clzll)
#define RAPIDJSON_CLZLL __builtin_clzll
#else

6
include/rapidjson/rapidjson.h
View File

@ -490,6 +490,12 @@ RAPIDJSON_NAMESPACE_END
#define RAPIDJSON_VERSION_CODE(x,y,z) \
(((x)*100000) + ((y)*100) + (z))
#if defined(__has_builtin)
#define RAPIDJSON_HAS_BUILTIN(x) __has_builtin(x)
#else
#define RAPIDJSON_HAS_BUILTIN(x) 0
#endif
///////////////////////////////////////////////////////////////////////////////
// RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF