Merge remote-tracking branch 'origin/patch-2'

This commit is contained in:
Dario Menendez 2015-10-16 11:22:57 +02:00
commit 8d53c5e06f

View file

@ -9228,8 +9228,11 @@ TEST_CASE("concepts")
SECTION("CopyAssignable") SECTION("CopyAssignable")
{ {
// STL iterators used by json::iterator don't pass this test in Debug mode
#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
} }
SECTION("Destructible") SECTION("Destructible")