More conversion fixes for gcc

cdunn2001 · cdunn2001 · commit fef4b75796c9 · 2016-02-06T10:10:49.000-06:00
diff --git a/include/json/writer.h b/include/json/writer.h
@@ -302,7 +302,7 @@ class JSON_API StyledStreamWriter {
   ChildValues childValues_;
   std::ostream* document_;
   std::string indentString_;
-  int rightMargin_;
+  unsigned int rightMargin_;
   std::string indentation_;
   bool addChildValues_ : 1;
   bool indented_ : 1;
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -524,7 +524,7 @@ bool StyledWriter::isMultineArray(const Value& value) {
         isMultiLine = true;
       }
       writeValue(value[index]);
-      lineLength += childValues_[index].length();
+      lineLength += static_cast<ArrayIndex>(childValues_[index].length());
     }
     addChildValues_ = false;
     isMultiLine = isMultiLine || lineLength >= rightMargin_;
@@ -743,7 +743,7 @@ bool StyledStreamWriter::isMultineArray(const Value& value) {
         isMultiLine = true;
       }
       writeValue(value[index]);
-      lineLength += childValues_[index].length();
+      lineLength += static_cast<ArrayIndex>(childValues_[index].length());
     }
     addChildValues_ = false;
     isMultiLine = isMultiLine || lineLength >= rightMargin_;
@@ -1026,7 +1026,7 @@ bool BuiltStyledStreamWriter::isMultineArray(Value const& value) {
         isMultiLine = true;
       }
       writeValue(value[index]);
-      lineLength += childValues_[index].length();
+      lineLength += static_cast<ArrayIndex>(childValues_[index].length());
     }
     addChildValues_ = false;
     isMultiLine = isMultiLine || lineLength >= rightMargin_;

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ bool StyledWriter::isMultineArray(const Value& value) {`
`524`	`524`	`isMultiLine = true;`
`525`	`525`	`}`
`526`	`526`	`writeValue(value[index]);`
`527`		`- lineLength += childValues_[index].length();`
	`527`	`+ lineLength += static_cast<ArrayIndex>(childValues_[index].length());`
`528`	`528`	`}`
`529`	`529`	`addChildValues_ = false;`
`530`	`530`	`isMultiLine = isMultiLine \|\| lineLength >= rightMargin_;`
`@@ -743,7 +743,7 @@ bool StyledStreamWriter::isMultineArray(const Value& value) {`
`743`	`743`	`isMultiLine = true;`
`744`	`744`	`}`
`745`	`745`	`writeValue(value[index]);`
`746`		`- lineLength += childValues_[index].length();`
	`746`	`+ lineLength += static_cast<ArrayIndex>(childValues_[index].length());`
`747`	`747`	`}`
`748`	`748`	`addChildValues_ = false;`
`749`	`749`	`isMultiLine = isMultiLine \|\| lineLength >= rightMargin_;`
`@@ -1026,7 +1026,7 @@ bool BuiltStyledStreamWriter::isMultineArray(Value const& value) {`
`1026`	`1026`	`isMultiLine = true;`
`1027`	`1027`	`}`
`1028`	`1028`	`writeValue(value[index]);`
`1029`		`- lineLength += childValues_[index].length();`
	`1029`	`+ lineLength += static_cast<ArrayIndex>(childValues_[index].length());`
`1030`	`1030`	`}`
`1031`	`1031`	`addChildValues_ = false;`
`1032`	`1032`	`isMultiLine = isMultiLine \|\| lineLength >= rightMargin_;`