Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
R
rapidjson
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
rapidjson
Commits
8991037e
Commit
8991037e
authored
Apr 05, 2016
by
Milo Yip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert using of static const back to enum due to gcc error
parent
c843a265
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
document.h
include/rapidjson/document.h
+14
-12
No files found.
include/rapidjson/document.h
View file @
8991037e
...
@@ -27,6 +27,7 @@
...
@@ -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,17 +1795,17 @@ private:
...
@@ -1794,17 +1795,17 @@ 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
,
kUintFlag
=
0x0040
,
kUintFlag
=
0x0040
,
kInt64Flag
=
0x0080
,
kInt64Flag
=
0x0080
,
kUint64Flag
=
0x0100
,
kUint64Flag
=
0x0100
,
kDoubleFlag
=
0x0200
,
kDoubleFlag
=
0x0200
,
kStringFlag
=
0x0400
,
kStringFlag
=
0x0400
,
kCopyFlag
=
0x0800
,
kCopyFlag
=
0x0800
,
kInlineStrFlag
=
0x1000
,
kInlineStrFlag
=
0x1000
,
// Initial flags of different types.
// Initial flags of different types.
kNullFlag
=
kNullType
,
kNullFlag
=
kNullType
,
...
@@ -1822,7 +1823,8 @@ private:
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment