Skip to content

Commit

Permalink
Apply the formatting specified in .clang-format file.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nekto89 committed Jun 2, 2018
1 parent fc20134 commit 84ca7d6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/lib_json/json_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,8 @@ bool Reader::readArray(Token& token) {
while (currentToken.type_ == tokenComment && ok) {
ok = readToken(currentToken);
}
bool badTokenType =
(currentToken.type_ != tokenArraySeparator && currentToken.type_ != tokenArrayEnd);
bool badTokenType = (currentToken.type_ != tokenArraySeparator &&
currentToken.type_ != tokenArrayEnd);
if (!ok || badTokenType) {
return addErrorAndRecover("Missing ',' or ']' in array declaration",
currentToken, tokenArrayEnd);
Expand Down Expand Up @@ -1538,8 +1538,8 @@ bool OurReader::readArray(Token& token) {
while (currentToken.type_ == tokenComment && ok) {
ok = readToken(currentToken);
}
bool badTokenType =
(currentToken.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd);
bool badTokenType = (currentToken.type_ != tokenArraySeparator &&
token.type_ != tokenArrayEnd);
if (!ok || badTokenType) {
return addErrorAndRecover("Missing ',' or ']' in array declaration",
currentToken, tokenArrayEnd);
Expand Down
4 changes: 2 additions & 2 deletions src/lib_json/json_value.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,8 @@ Value::Value(const char* value) {

Value::Value(const char* begin, const char* end) {
initBasic(stringValue, true);
value_.string_ = duplicateAndPrefixStringValue(
begin, static_cast<unsigned>(end - begin));
value_.string_ =
duplicateAndPrefixStringValue(begin, static_cast<unsigned>(end - begin));
}

Value::Value(const JSONCPP_STRING& value) {
Expand Down

0 comments on commit 84ca7d6

Please sign in to comment.