Merge branch 'develop' into develop-simplify-istream

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);

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

test/src/unit-udt.cpp

@@ -201,7 +201,7 @@ void from_json(const BasicJsonType& j, country& c)
     {
         {u8"中华人民共和国", country::china},
         {"France", country::france},
-        {"Российская Федерация", country::russia}
+        {u8"Российская Федерация", country::russia}
     };
 
     const auto it = m.find(str);