commit fef4b75796c96ceca9af6061d79a91b8a454447e
author Christopher Dunn <cdunn2001@gmail.com> Sat Feb 06 09:59:18 2016 -0600
committer Christopher Dunn <cdunn2001@gmail.com> Sat Feb 06 10:10:49 2016 -0600
tree 7fd15cb65f4818f757f7b22b9909a9e432545e0e
parent 779d8a33fcf5e52ed20b5625d86b169fbeb1a42b

More conversion fixes for gcc

include/json/writer.h

diff --git a/include/json/writer.h b/include/json/writer.h
index 180ab68..49b1512 100644
--- a/include/json/writer.h
+++ b/include/json/writer.h
@@ -302,7 +302,7 @@
   ChildValues childValues_;
   std::ostream* document_;
   std::string indentString_;
-  int rightMargin_;
+  unsigned int rightMargin_;
   std::string indentation_;
   bool addChildValues_ : 1;
   bool indented_ : 1;

src/lib_json/json_writer.cpp

diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index f7ceedc..f1f4dcc 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -524,7 +524,7 @@
         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 @@
         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 @@
         isMultiLine = true;
       }
       writeValue(value[index]);
-      lineLength += childValues_[index].length();
+      lineLength += static_cast<ArrayIndex>(childValues_[index].length());
     }
     addChildValues_ = false;
     isMultiLine = isMultiLine || lineLength >= rightMargin_;