mirror of
https://github.com/nlohmann/json.git
synced 2026-07-09 03:55:09 +00:00
Fix constraints on from_json() for strings (#3427)
Constrain from_json() overload for StringType to not accept json_ref and require it to be assignable, instead of constructible, from basic_json::string_t. Re-enable C++14 tests on Clang <4.0. Fixes #3171. Fixes #3267. Fixes #3312. Fixes #3384.
This commit is contained in:
committed by
GitHub
parent
15fa6a342a
commit
261cc4e509
@@ -11,11 +11,6 @@ include(test)
|
||||
# override standard support
|
||||
#############################################################################
|
||||
|
||||
# compiling json.hpp in C++14 mode fails with Clang <4.0
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
|
||||
unset(compiler_supports_cpp_14)
|
||||
endif()
|
||||
|
||||
# Clang only supports C++17 starting from Clang 5.0
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
|
||||
unset(compiler_supports_cpp_17)
|
||||
|
||||
Reference in New Issue
Block a user