generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-10-28 03:20:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into TransitionTable

Browse Source
This commit is contained in:
thebusytypist
2014-07-11 12:52:07 +08:00
parent 70d01cc5f3 e440b695a1
commit 36434b66c8
38 changed files with 3555 additions and 1436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/unittest/readertest.cpp
View File

@@ -6,8 +6,8 @@
using namespace rapidjson;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Weffc++"
RAPIDJSON_DIAG_PUSH
RAPIDJSON_DIAG_OFF(effc++)
#endif
template<bool expect>
@@ -1176,5 +1176,5 @@ TEST(Reader, IterativeParsing_StateTransition_ElementDelimiter) {
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
RAPIDJSON_DIAG_POP
#endif