3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-30 22:14:09 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #365 from ya1gaurav/patch-29

Browse Source 
Remove conditional check for isMultiLine
This commit is contained in:
Christopher Dunn 2015-09-22 05:08:56 -05:00
commit 9942f6a1c7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib_json/json_writer.cpp
View File

@ -489,8 +489,7 @@ bool StyledWriter::isMultineArray(const Value& value) {
childValues_.clear(); childValues_.clear();
for (int index = 0; index < size && !isMultiLine; ++index) { for (int index = 0; index < size && !isMultiLine; ++index) {
const Value& childValue = value[index]; const Value& childValue = value[index];
isMultiLine = isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
isMultiLine || ((childValue.isArray() || childValue.isObject()) &&
childValue.size() > 0); childValue.size() > 0);
} }
if (!isMultiLine) // check if line length > max line length if (!isMultiLine) // check if line length > max line length
@ -709,8 +708,7 @@ bool StyledStreamWriter::isMultineArray(const Value& value) {
childValues_.clear(); childValues_.clear();
for (int index = 0; index < size && !isMultiLine; ++index) { for (int index = 0; index < size && !isMultiLine; ++index) {
const Value& childValue = value[index]; const Value& childValue = value[index];
isMultiLine = isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
isMultiLine || ((childValue.isArray() || childValue.isObject()) &&
childValue.size() > 0); childValue.size() > 0);
} }
if (!isMultiLine) // check if line length > max line length if (!isMultiLine) // check if line length > max line length
@ -989,8 +987,7 @@ bool BuiltStyledStreamWriter::isMultineArray(Value const& value) {
childValues_.clear(); childValues_.clear();
for (int index = 0; index < size && !isMultiLine; ++index) { for (int index = 0; index < size && !isMultiLine; ++index) {
Value const& childValue = value[index]; Value const& childValue = value[index];
isMultiLine = isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
isMultiLine || ((childValue.isArray() || childValue.isObject()) &&
childValue.size() > 0); childValue.size() > 0);
} }
if (!isMultiLine) // check if line length > max line length if (!isMultiLine) // check if line length > max line length