Skip to content

Commit fef4b75

Browse files
committed
More conversion fixes for gcc
1 parent 779d8a3 commit fef4b75

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/json/writer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ class JSON_API StyledStreamWriter {
302302
ChildValues childValues_;
303303
std::ostream* document_;
304304
std::string indentString_;
305-
int rightMargin_;
305+
unsigned int rightMargin_;
306306
std::string indentation_;
307307
bool addChildValues_ : 1;
308308
bool indented_ : 1;

src/lib_json/json_writer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ bool StyledWriter::isMultineArray(const Value& value) {
524524
isMultiLine = true;
525525
}
526526
writeValue(value[index]);
527-
lineLength += childValues_[index].length();
527+
lineLength += static_cast<ArrayIndex>(childValues_[index].length());
528528
}
529529
addChildValues_ = false;
530530
isMultiLine = isMultiLine || lineLength >= rightMargin_;
@@ -743,7 +743,7 @@ bool StyledStreamWriter::isMultineArray(const Value& value) {
743743
isMultiLine = true;
744744
}
745745
writeValue(value[index]);
746-
lineLength += childValues_[index].length();
746+
lineLength += static_cast<ArrayIndex>(childValues_[index].length());
747747
}
748748
addChildValues_ = false;
749749
isMultiLine = isMultiLine || lineLength >= rightMargin_;
@@ -1026,7 +1026,7 @@ bool BuiltStyledStreamWriter::isMultineArray(Value const& value) {
10261026
isMultiLine = true;
10271027
}
10281028
writeValue(value[index]);
1029-
lineLength += childValues_[index].length();
1029+
lineLength += static_cast<ArrayIndex>(childValues_[index].length());
10301030
}
10311031
addChildValues_ = false;
10321032
isMultiLine = isMultiLine || lineLength >= rightMargin_;

0 commit comments

Comments
 (0)