diff options
3 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index f18471315a1..40214442f87 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -2154,7 +2154,7 @@ class __compressed_pair : private __compressed_pair_elem<_T1, 0>, // is *almost never* used in a scenario where it's possible for T1 == T2. // (The exception is std::function where it is possible that the function // object and the allocator have the same type). - static_assert(!is_same<_T1, _T2>::value, + static_assert((!is_same<_T1, _T2>::value), "__compressed_pair cannot be instantated when T1 and T2 are the same type; " "The current implementation is NOT ABI-compatible with the previous " "implementation for this configuration"); diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp index ff59b3b9f80..43ad29623ca 100644 --- a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp +++ b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "test_macros.h" -#if defined(_LIBCPP_VERSION) +#if defined(_LIBCPP_VERSION) && TEST_STD_VER >= 11 _LIBCPP_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr; #endif diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp index 6508d9360e5..7f589893809 100644 --- a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp +++ b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp @@ -29,7 +29,7 @@ #include "deleter_types.h" -#if defined(_LIBCPP_VERSION) +#if defined(_LIBCPP_VERSION) && TEST_STD_VER >= 11 _LIBCPP_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr; #endif |
