Commit 95090a7d by dariomt

Merge branch 'patch-2'

parents 8f97e99f 04cc7d5a
...@@ -9229,7 +9229,7 @@ TEST_CASE("concepts") ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment