maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix C++03 test failures 

llvm-svn: 300159
This commit is contained in:
Eric Fiselier 2017-04-13 01:13:58 +00:00
parent ed9caee9a8
commit b411e9ce4d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/include/memory
View File

@ -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");

2
libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default.pass.cpp
View File

@ -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

2
libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default.pass.cpp
View File

@ -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