Merge pull request open-source-parsers#304 from cdunn2001/297

cdunn2001 · cdunn2001 · commit b26804d1c217 · 2015-07-11T11:08:47.000-05:00
Same as open-source-parsers#297 (1c4f274), but properly rebased
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,7 +97,7 @@ endif( MSVC )
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   # using regular Clang or AppleClang
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wshorten-64-to-32")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   # using GCC
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wextra -pedantic")
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -125,7 +125,7 @@ inline static void decodePrefixedString(
     unsigned* length, char const** value)
 {
   if (!isPrefixed) {
-    *length = strlen(prefixed);
+    *length = static_cast<unsigned>(strlen(prefixed));
     *value = prefixed;
   } else {
     *length = *reinterpret_cast<unsigned const*>(prefixed);
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
@@ -354,7 +354,7 @@ void FastWriter::writeValue(const Value& value) {
       const std::string& name = *it;
       if (it != members.begin())
         document_ += ',';
-      document_ += valueToQuotedStringN(name.data(), name.length());
+      document_ += valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length()));
       document_ += yamlCompatiblityEnabled_ ? ": " : ":";
       writeValue(value[name]);
     }
@@ -914,7 +914,7 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
         std::string const& name = *it;
         Value const& childValue = value[name];
         writeCommentBeforeValue(childValue);
-        writeWithIndent(valueToQuotedStringN(name.data(), name.length()));
+        writeWithIndent(valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length())));
         *sout_ << colonSymbol_;
         writeValue(childValue);
         if (++it == members.end()) {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ inline static void decodePrefixedString(`
`125`	`125`	`unsigned* length, char const** value)`
`126`	`126`	`{`
`127`	`127`	`if (!isPrefixed) {`
`128`		`- *length = strlen(prefixed);`
	`128`	`+ *length = static_cast<unsigned>(strlen(prefixed));`
`129`	`129`	`*value = prefixed;`
`130`	`130`	`} else {`
`131`	`131`	`length = reinterpret_cast<unsigned const*>(prefixed);`