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

Merge branch 'patch-2'

Browse source
This commit is contained in:
dariomt 2015-10-16 16:40:57 +02:00
commit 95090a7ddd
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/unit.cpp
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