[libcxx] r300159 - Fix C++03 test failures

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Wed Apr 12 20:13:58 2017
New Revision: 300159

URL: http://llvm.org/viewvc/llvm-project?rev=300159&view=rev
Log:
Fix C++03 test failures

Modified:
    libcxx/trunk/include/memory
    libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp
    libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp

Modified: libcxx/trunk/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=300159&r1=300158&r2=300159&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Wed Apr 12 20:13:58 2017
@@ -2154,7 +2154,7 @@ class __compressed_pair : private __comp
   // 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");

Modified: libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp?rev=300159&r1=300158&r2=300159&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp Wed Apr 12 20:13:58 2017
@@ -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
 

Modified: libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp?rev=300159&r1=300158&r2=300159&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp Wed Apr 12 20:13:58 2017
@@ -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