generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-20 07:51:32 +02:00
Code Issues Projects Releases Wiki Activity

Apply the formatting specified in .clang-format file.

Browse Source
This commit is contained in:
Marian Klymov 2018-06-02 20:27:31 +03:00
parent fc20134c92
commit 84ca7d6f0b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib_json/json_reader.cpp
View File

@ -542,8 +542,8 @@ bool Reader::readArray(Token& token) {
while (currentToken.type_ == tokenComment && ok) { while (currentToken.type_ == tokenComment && ok) {
ok = readToken(currentToken); ok = readToken(currentToken);
} }
bool badTokenType = bool badTokenType = (currentToken.type_ != tokenArraySeparator &&
(currentToken.type_ != tokenArraySeparator && currentToken.type_ != tokenArrayEnd); currentToken.type_ != tokenArrayEnd);
if (!ok || badTokenType) { if (!ok || badTokenType) {
return addErrorAndRecover("Missing ',' or ']' in array declaration", return addErrorAndRecover("Missing ',' or ']' in array declaration",
currentToken, tokenArrayEnd); currentToken, tokenArrayEnd);
@ -1538,8 +1538,8 @@ bool OurReader::readArray(Token& token) {
while (currentToken.type_ == tokenComment && ok) { while (currentToken.type_ == tokenComment && ok) {
ok = readToken(currentToken); ok = readToken(currentToken);
} }
bool badTokenType = bool badTokenType = (currentToken.type_ != tokenArraySeparator &&
(currentToken.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd); token.type_ != tokenArrayEnd);
if (!ok || badTokenType) { if (!ok || badTokenType) {
return addErrorAndRecover("Missing ',' or ']' in array declaration", return addErrorAndRecover("Missing ',' or ']' in array declaration",
currentToken, tokenArrayEnd); currentToken, tokenArrayEnd);

4
src/lib_json/json_value.cpp
View File

@ -420,8 +420,8 @@ Value::Value(const char* value) {
Value::Value(const char* begin, const char* end) { Value::Value(const char* begin, const char* end) {
initBasic(stringValue, true); initBasic(stringValue, true);
value_.string_ = duplicateAndPrefixStringValue( value_.string_ =
begin, static_cast<unsigned>(end - begin)); duplicateAndPrefixStringValue(begin, static_cast<unsigned>(end - begin));
} }
Value::Value(const JSONCPP_STRING& value) { Value::Value(const JSONCPP_STRING& value) {