Merge pull request #788 from jseward/develop

Fix Visual Studio 2017 warnings
nlohmann · Oct 18, 2017 · 2e281ba · 2e281ba
2 parents 7c8f0a4 + a99fcb4
commit 2e281ba
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -5292,7 +5292,7 @@ class binary_reader
         {
             get();
             check_eof();
-            return current;
+            return static_cast<char>(current);
         });
         return result;
     }

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -76,7 +76,10 @@ if(MSVC)
     endif()
 
     # Disable warning C4389: '==': signed/unsigned mismatch
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4389")
+	# Disable warning C4309: 'static_cast': truncation of constant value
+	# Disable warning C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252)
+	# Disable warning C4996: 'nlohmann::basic_json<std::map,std::vector,std::string,bool,int64_t,uint64_t,double,std::allocator,nlohmann::adl_serializer>::operator <<': was declared deprecated
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4389 /wd4309 /wd4566 /wd4996")
 endif()
 
 #############################################################################

diff --git a/test/src/unit-constructor1.cpp b/test/src/unit-constructor1.cpp
@@ -242,7 +242,7 @@ TEST_CASE("constructors")
 
         SECTION("std::pair")
         {
-            std::pair<float, std::string> p{1.0, "string"};
+            std::pair<float, std::string> p{1.0f, "string"};
             json j(p);
 
             CHECK(j.type() == json::value_t::array);

diff --git a/test/src/unit-readme.cpp b/test/src/unit-readme.cpp
@@ -38,6 +38,11 @@ using nlohmann::json;
 #include <unordered_set>
 #include <iostream>
 
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable : 4189) // local variable is initialized but not referenced
+#endif
+
 TEST_CASE("README", "[hide]")
 {
     {
@@ -298,3 +303,7 @@ TEST_CASE("README", "[hide]")
         std::cout.rdbuf(old_cout_buffer);
     }
 }
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif