amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-21 21:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-2'

Browse Source
This commit is contained in:
dariomt committed 2015-10-16 16:40:57 +02:00
2 parents 8f97e99feb 04cc7d5a05
commit 95090a7ddd
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
test/unit.cpp
+1 -1
View File
@@ -9229,7 +9229,7 @@ TEST_CASE("concepts")
SECTION("CopyAssignable") SECTION("CopyAssignable")
{ {
// STL iterators used by json::iterator don't pass this test in Debug mode // STL iterators used by json::iterator don't pass this test in Debug mode
#if defined(_MSC_VER) && (_ITERATOR_DEBUG_LEVEL == 0) #if !defined(_MSC_VER) || (_ITERATOR_DEBUG_LEVEL == 0)
CHECK(std::is_nothrow_copy_assignable<json::iterator>::value); CHECK(std::is_nothrow_copy_assignable<json::iterator>::value);
CHECK(std::is_nothrow_copy_assignable<json::const_iterator>::value); CHECK(std::is_nothrow_copy_assignable<json::const_iterator>::value);
#endif #endif