Skip to content

R
rapidjson
Commit fc80636c authored by Milo Yip's avatar Milo Yip
Browse files
Options

Merge pull request #10 from pah/fixes/57 

GenericValue: fixup construction from NumberType
parents 1ffd7b4a d4ff956b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
include/rapidjson/document.h
View file @ fc80636c
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
GenericValue(Type type) { GenericValue(Type type) {
static const unsigned defaultFlags[7] = { static const unsigned defaultFlags[7] = {
kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kConstStringFlag, kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kConstStringFlag,
kNumberFlag | kIntFlag | kUintFlag | kInt64Flag | kUint64Flag | kDoubleFlag kNumberAnyFlag
}; };
RAPIDJSON_ASSERT(type <= kNumberType); RAPIDJSON_ASSERT(type <= kNumberType);
flags_ = defaultFlags[type]; flags_ = defaultFlags[type];
...@@ -578,6 +578,7 @@ private: ...@@ -578,6 +578,7 @@ private:
kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag, kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag,
kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag, kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag,
kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag, kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag,
kNumberAnyFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag,
kConstStringFlag = kStringType | kStringFlag, kConstStringFlag = kStringType | kStringFlag,
kCopyStringFlag = kStringType | kStringFlag | kCopyFlag, kCopyStringFlag = kStringType | kStringFlag | kCopyFlag,
kObjectFlag = kObjectType, kObjectFlag = kObjectType,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment