j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #788 from jseward/develop

Browse source 
Fix Visual Studio 2017 warnings
This commit is contained in:
Niels Lohmann 2017-10-18 15:04:24 +02:00 committed by GitHub
commit 2e281ba64b
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.hpp
View file

@ -5292,7 +5292,7 @@ class binary_reader
{ {
get(); get();
check_eof(); check_eof();
return current; return static_cast<char>(current);
}); });
return result; return result;
} }

5
test/CMakeLists.txt
View file

@ -76,7 +76,10 @@ if(MSVC)
endif() endif()
# Disable warning C4389: '==': signed/unsigned mismatch # 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() endif()
############################################################################# #############################################################################

2
test/src/unit-constructor1.cpp
View file

@ -242,7 +242,7 @@ TEST_CASE("constructors")
SECTION("std::pair") SECTION("std::pair")
{ {
std::pair<float, std::string> p{1.0, "string"}; std::pair<float, std::string> p{1.0f, "string"};
json j(p); json j(p);
CHECK(j.type() == json::value_t::array); CHECK(j.type() == json::value_t::array);

9
test/src/unit-readme.cpp
View file

@ -38,6 +38,11 @@ using nlohmann::json;
#include <unordered_set> #include <unordered_set>
#include <iostream> #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]") TEST_CASE("README", "[hide]")
{ {
{ {
@ -298,3 +303,7 @@ TEST_CASE("README", "[hide]")
std::cout.rdbuf(old_cout_buffer); std::cout.rdbuf(old_cout_buffer);
} }
} }
#if defined(_MSC_VER)
#pragma warning (pop)
#endif