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

8d53c5e0 · Dario Menendez · 55cbd903 · 9d45aafc · 8d53c5e0
Commit 8d53c5e0 authored Oct 16, 2015 by Dario Menendez
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

unit.cpp test/unit.cpp +3 -0

No files found.
--- a/test/unit.cpp
+++ b/test/unit.cpp
@@ -9228,8 +9228,11 @@ TEST_CASE("concepts")

        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::const_iterator>::value);
+#endif
        }

        SECTION("Destructible")