generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-12 18:10:27 +01:00
Code Issues Projects Releases Wiki Activity

More conversion fixes for gcc

Browse Source
This commit is contained in:
Christopher Dunn 2016-02-06 09:59:18 -06:00
parent 779d8a33fc
commit fef4b75796
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/json/writer.h
View File

@ -302,7 +302,7 @@ private:
ChildValues childValues_; ChildValues childValues_;
std::ostream* document_; std::ostream* document_;
std::string indentString_; std::string indentString_;
int rightMargin_; unsigned int rightMargin_;
std::string indentation_; std::string indentation_;
bool addChildValues_ : 1; bool addChildValues_ : 1;
bool indented_ : 1; bool indented_ : 1;

6
src/lib_json/json_writer.cpp
View File

@ -524,7 +524,7 @@ bool StyledWriter::isMultineArray(const Value& value) {
isMultiLine = true; isMultiLine = true;
} }
writeValue(value[index]); writeValue(value[index]);
lineLength += childValues_[index].length(); lineLength += static_cast<ArrayIndex>(childValues_[index].length());
} }
addChildValues_ = false; addChildValues_ = false;
isMultiLine = isMultiLine || lineLength >= rightMargin_; isMultiLine = isMultiLine || lineLength >= rightMargin_;
@ -743,7 +743,7 @@ bool StyledStreamWriter::isMultineArray(const Value& value) {
isMultiLine = true; isMultiLine = true;
} }
writeValue(value[index]); writeValue(value[index]);
lineLength += childValues_[index].length(); lineLength += static_cast<ArrayIndex>(childValues_[index].length());
} }
addChildValues_ = false; addChildValues_ = false;
isMultiLine = isMultiLine || lineLength >= rightMargin_; isMultiLine = isMultiLine || lineLength >= rightMargin_;
@ -1026,7 +1026,7 @@ bool BuiltStyledStreamWriter::isMultineArray(Value const& value) {
isMultiLine = true; isMultiLine = true;
} }
writeValue(value[index]); writeValue(value[index]);
lineLength += childValues_[index].length(); lineLength += static_cast<ArrayIndex>(childValues_[index].length());
} }
addChildValues_ = false; addChildValues_ = false;
isMultiLine = isMultiLine || lineLength >= rightMargin_; isMultiLine = isMultiLine || lineLength >= rightMargin_;