mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-30 18:59:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add comments and newline

Browse Source
This commit is contained in:
Jamie Seward 2017-10-17 22:53:35 -07:00
parent 917d9d8bc3
commit a99fcb4e7d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/CMakeLists.txt
View File

@ -75,10 +75,10 @@ if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
endif() endif()
# warning C4389: '==': signed/unsigned mismatch # Disable warning C4389: '==': signed/unsigned mismatch
# warning C4309: 'static_cast': truncation of constant value # Disable warning C4309: 'static_cast': truncation of constant value
# warning C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252) # Disable warning C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252)
# 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 # 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") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4389 /wd4309 /wd4566 /wd4996")
endif() endif()

2
test/src/unit-readme.cpp
View File

@ -306,4 +306,4 @@ TEST_CASE("README", "[hide]")
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning (pop) #pragma warning (pop)
#endif #endif