drop trailing commas in enums
In C++'98/03, trailing commas in enumerations are not allowed, but have been introduced in C++11. This patch drops the trailing commas in order to avoid compiler warnings (e.g. GCC with -pedantic). Fixes http://code.google.com/p/rapidjson/issues/detail?id=49.
This commit is contained in:
parent
23056abad1
commit
1320ba77a7
@ -448,7 +448,7 @@ enum UTFType {
|
|||||||
kUTF16LE = 1, //!< UTF-16 little endian.
|
kUTF16LE = 1, //!< UTF-16 little endian.
|
||||||
kUTF16BE = 2, //!< UTF-16 big endian.
|
kUTF16BE = 2, //!< UTF-16 big endian.
|
||||||
kUTF32LE = 3, //!< UTF-32 little endian.
|
kUTF32LE = 3, //!< UTF-32 little endian.
|
||||||
kUTF32BE = 4, //!< UTF-32 big endian.
|
kUTF32BE = 4 //!< UTF-32 big endian.
|
||||||
};
|
};
|
||||||
|
|
||||||
//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
|
//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
|
||||||
|
@ -248,7 +248,7 @@ enum Type {
|
|||||||
kObjectType = 3, //!< object
|
kObjectType = 3, //!< object
|
||||||
kArrayType = 4, //!< array
|
kArrayType = 4, //!< array
|
||||||
kStringType = 5, //!< string
|
kStringType = 5, //!< string
|
||||||
kNumberType = 6, //!< number
|
kNumberType = 6 //!< number
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace rapidjson
|
} // namespace rapidjson
|
||||||
|
@ -39,7 +39,7 @@ namespace rapidjson {
|
|||||||
enum ParseFlag {
|
enum ParseFlag {
|
||||||
kParseDefaultFlags = 0, //!< Default parse flags. Non-destructive parsing. Text strings are decoded into allocated buffer.
|
kParseDefaultFlags = 0, //!< Default parse flags. Non-destructive parsing. Text strings are decoded into allocated buffer.
|
||||||
kParseInsituFlag = 1, //!< In-situ(destructive) parsing.
|
kParseInsituFlag = 1, //!< In-situ(destructive) parsing.
|
||||||
kParseValidateEncodingFlag = 2, //!< Validate encoding of JSON strings.
|
kParseValidateEncodingFlag = 2 //!< Validate encoding of JSON strings.
|
||||||
};
|
};
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
Loading…
x
Reference in New Issue
Block a user