Commit 56f9b2d1 authored by Wouter van Oortmerssen's avatar Wouter van Oortmerssen

Merge pull request #3492 from parnic/fix-vs2012-warnings

Fix vs2012 warnings
parents a6a38f60 e0b2f818
......@@ -1513,7 +1513,7 @@ CheckedError Parser::SkipAnyJsonValue() {
EXPECT(kTokenFloatConstant);
break;
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();
}
......@@ -1522,7 +1522,7 @@ CheckedError Parser::SkipJsonObject() {
EXPECT('{');
size_t fieldn = 0;
while (true) {
for (;;) {
if ((!opts.strict_json || !fieldn) && Is('}')) break;
if (!Is(kTokenStringConstant))
......@@ -1543,7 +1543,7 @@ CheckedError Parser::SkipJsonObject() {
CheckedError Parser::SkipJsonArray() {
EXPECT('[');
while (true) {
for (;;) {
if (Is(']')) break;
ECHECK(SkipAnyJsonValue());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment