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

Revert using of static const back to enum due to gcc error

Browse Source
This commit is contained in:
Milo Yip 2016-04-05 23:26:08 +08:00
parent c843a2655b
commit 8991037ecd
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rapidjson/document.h
View File

@ -27,6 +27,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PUSH
RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
#endif #endif
#ifdef __clang__ #ifdef __clang__
@ -1794,7 +1795,7 @@ private:
template <typename, typename> friend class GenericValue; template <typename, typename> friend class GenericValue;
template <typename, typename, typename> friend class GenericDocument; template <typename, typename, typename> friend class GenericDocument;
static const uint16_t enum {
kBoolFlag = 0x0008, kBoolFlag = 0x0008,
kNumberFlag = 0x0010, kNumberFlag = 0x0010,
kIntFlag = 0x0020, kIntFlag = 0x0020,
@ -1822,7 +1823,8 @@ private:
kObjectFlag = kObjectType, kObjectFlag = kObjectType,
kArrayFlag = kArrayType, kArrayFlag = kArrayType,
kTypeMask = 0x07; kTypeMask = 0x07
};
static const SizeType kDefaultArrayCapacity = 16; static const SizeType kDefaultArrayCapacity = 16;
static const SizeType kDefaultObjectCapacity = 16; static const SizeType kDefaultObjectCapacity = 16;