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
ce0184e7
Commit
ce0184e7
authored
Jun 03, 2015
by
miloyip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add and fix -Wimplicit-fallthrough for clang, revert #350
parent
1f78bc11
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
reader.h
include/rapidjson/reader.h
+7
-7
CMakeLists.txt
test/unittest/CMakeLists.txt
+1
-1
No files found.
include/rapidjson/reader.h
View file @
ce0184e7
...
...
@@ -109,7 +109,7 @@ RAPIDJSON_DIAG_OFF(effc++)
#define RAPIDJSON_PARSE_ERROR(parseErrorCode, offset) \
RAPIDJSON_MULTILINEMACRO_BEGIN
\
RAPIDJSON_PARSE_ERROR_NORETURN
(
parseErrorCode
,
offset
);
\
return
RAPIDJSON_NOTHING
;
\
RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID
;
\
RAPIDJSON_MULTILINEMACRO_END
#endif
...
...
@@ -1387,13 +1387,13 @@ private:
}
switch
(
src
)
{
case
IterativeParsingStartState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorDocumentEmpty
,
is
.
Tell
());
case
IterativeParsingFinishState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorDocumentRootNotSingular
,
is
.
Tell
());
case
IterativeParsingStartState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorDocumentEmpty
,
is
.
Tell
());
return
;
case
IterativeParsingFinishState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorDocumentRootNotSingular
,
is
.
Tell
());
return
;
case
IterativeParsingObjectInitialState
:
case
IterativeParsingMemberDelimiterState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorObjectMissName
,
is
.
Tell
());
case
IterativeParsingMemberKeyState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorObjectMissColon
,
is
.
Tell
());
case
IterativeParsingMemberValueState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorObjectMissCommaOrCurlyBracket
,
is
.
Tell
());
case
IterativeParsingElementState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorArrayMissCommaOrSquareBracket
,
is
.
Tell
());
case
IterativeParsingMemberDelimiterState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorObjectMissName
,
is
.
Tell
());
return
;
case
IterativeParsingMemberKeyState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorObjectMissColon
,
is
.
Tell
());
return
;
case
IterativeParsingMemberValueState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorObjectMissCommaOrCurlyBracket
,
is
.
Tell
());
return
;
case
IterativeParsingElementState
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorArrayMissCommaOrSquareBracket
,
is
.
Tell
());
return
;
default
:
RAPIDJSON_PARSE_ERROR
(
kParseErrorUnspecificSyntaxError
,
is
.
Tell
());
}
}
...
...
test/unittest/CMakeLists.txt
View file @
ce0184e7
...
...
@@ -21,7 +21,7 @@ set(UNITTEST_SOURCES
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"GNU"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal"
)
elseif
(
CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal
-Wimplicit-fallthrough
"
)
elseif
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"MSVC"
)
add_definitions
(
-D_CRT_SECURE_NO_WARNINGS=1
)
endif
()
...
...
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