gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to fix clang and gcc warnings problems

Browse Source
This commit is contained in:
Milo Yip 2015-12-18 19:04:09 +08:00
parent 74c8dcfd57
commit 17f2ca6913
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/rapidjson/document.h
View File

@ -30,6 +30,7 @@ RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
#ifdef __clang__ #ifdef __clang__
RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PUSH
RAPIDJSON_DIAG_OFF(padded) RAPIDJSON_DIAG_OFF(padded)
RAPIDJSON_DIAG_OFF(switch-enum)
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
@ -724,9 +725,7 @@ public:
else else
return data_.n.u64 == rhs.data_.n.u64; return data_.n.u64 == rhs.data_.n.u64;
case kNullType: default:
case kFalseType:
case kTrueType:
return true; return true;
} }
} }
@ -2106,10 +2105,7 @@ GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,Sourc
SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator); SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
} }
break; break;
case kNullType: default:
case kFalseType:
case kTrueType:
case kNumberType:
flags_ = rhs.flags_; flags_ = rhs.flags_;
data_ = *reinterpret_cast<const Data*>(&rhs.data_); data_ = *reinterpret_cast<const Data*>(&rhs.data_);
break; break;

13
include/rapidjson/reader.h
View File

@ -42,6 +42,7 @@ RAPIDJSON_DIAG_OFF(4702) // unreachable code
#ifdef __clang__ #ifdef __clang__
RAPIDJSON_DIAG_PUSH RAPIDJSON_DIAG_PUSH
RAPIDJSON_DIAG_OFF(padded) RAPIDJSON_DIAG_OFF(padded)
RAPIDJSON_DIAG_OFF(switch-enum)
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
@ -1417,9 +1418,7 @@ private:
} }
} }
case IterativeParsingStartState: default:
case IterativeParsingFinishState:
case IterativeParsingValueState:
// This branch is for IterativeParsingValueState actually. // This branch is for IterativeParsingValueState actually.
// Use `default:` rather than // Use `default:` rather than
// `case IterativeParsingValueState:` is for code coverage. // `case IterativeParsingValueState:` is for code coverage.
@ -1456,13 +1455,7 @@ private:
case IterativeParsingMemberKeyState: RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell()); return; case IterativeParsingMemberKeyState: RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell()); return;
case IterativeParsingMemberValueState: RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); return; case IterativeParsingMemberValueState: RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); return;
case IterativeParsingElementState: RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell()); return; case IterativeParsingElementState: RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell()); return;
case IterativeParsingErrorState: default: RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell()); return;
case IterativeParsingKeyValueDelimiterState:
case IterativeParsingObjectFinishState:
case IterativeParsingArrayInitialState:
case IterativeParsingElementDelimiterState:
case IterativeParsingArrayFinishState:
case IterativeParsingValueState: RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell()); return;
} }
} }

2
test/unittest/unittest.h
View File

@ -19,8 +19,10 @@
#ifndef __STDC_CONSTANT_MACROS #ifndef __STDC_CONSTANT_MACROS
#ifdef __clang__ #ifdef __clang__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#if __has_warning("-Wreserved-id-macro")
#pragma GCC diagnostic ignored "-Wreserved-id-macro" #pragma GCC diagnostic ignored "-Wreserved-id-macro"
#endif #endif
#endif
# define __STDC_CONSTANT_MACROS 1 // required by C++ standard # define __STDC_CONSTANT_MACROS 1 // required by C++ standard