mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-22 15:08:52 +00:00
Merge pull request #3492 from parnic/fix-vs2012-warnings
Fix vs2012 warnings
This commit is contained in:
@@ -1513,7 +1513,7 @@ CheckedError Parser::SkipAnyJsonValue() {
|
|||||||
EXPECT(kTokenFloatConstant);
|
EXPECT(kTokenFloatConstant);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return Error(std::string("Unexpected token:") + std::string(1, token_));
|
return Error(std::string("Unexpected token:") + std::string(1, static_cast<char>(token_)));
|
||||||
}
|
}
|
||||||
return NoError();
|
return NoError();
|
||||||
}
|
}
|
||||||
@@ -1522,7 +1522,7 @@ CheckedError Parser::SkipJsonObject() {
|
|||||||
EXPECT('{');
|
EXPECT('{');
|
||||||
size_t fieldn = 0;
|
size_t fieldn = 0;
|
||||||
|
|
||||||
while (true) {
|
for (;;) {
|
||||||
if ((!opts.strict_json || !fieldn) && Is('}')) break;
|
if ((!opts.strict_json || !fieldn) && Is('}')) break;
|
||||||
|
|
||||||
if (!Is(kTokenStringConstant))
|
if (!Is(kTokenStringConstant))
|
||||||
@@ -1543,7 +1543,7 @@ CheckedError Parser::SkipJsonObject() {
|
|||||||
CheckedError Parser::SkipJsonArray() {
|
CheckedError Parser::SkipJsonArray() {
|
||||||
EXPECT('[');
|
EXPECT('[');
|
||||||
|
|
||||||
while (true) {
|
for (;;) {
|
||||||
if (Is(']')) break;
|
if (Is(']')) break;
|
||||||
|
|
||||||
ECHECK(SkipAnyJsonValue());
|
ECHECK(SkipAnyJsonValue());
|
||||||
|
|||||||
Reference in New Issue
Block a user