summaryrefslogtreecommitdiffstats
path: root/libcxx/test/support
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-09-25 03:34:28 +0000
committerEric Fiselier <eric@efcs.ca>2016-09-25 03:34:28 +0000
commit54613ab4d448d5df567ae12451ba37cae73f1ac7 (patch)
tree6037ab2528d99c9d314ed37d2382d721140664ac /libcxx/test/support
parent84505f9a9c958e5728c4b500ef429c29f72a7ff5 (diff)
downloadbcm5719-llvm-54613ab4d448d5df567ae12451ba37cae73f1ac7.tar.gz
bcm5719-llvm-54613ab4d448d5df567ae12451ba37cae73f1ac7.zip
[libc++] Remove various C++03 feature test macros
Summary: Libc++ still uses per-feature configuration macros when configuring for C++11. However libc++ requires a feature-complete C++11 compiler so there is no reason to check individual features. This patch starts the process of removing the feature specific macros and replacing their usage with `_LIBCPP_CXX03_LANG`. This patch removes the __config macros: * _LIBCPP_HAS_NO_TRAILING_RETURN * _LIBCPP_HAS_NO_TEMPLATE_ALIASES * _LIBCPP_HAS_NO_ADVANCED_SFINAE * _LIBCPP_HAS_NO_DEFAULT_FUNCTION_TEMPLATE_ARGS * _LIBCPP_HAS_NO_STATIC_ASSERT As a drive I also changed our C++03 static_assert to use _Static_assert if available. I plan to commit this without review if nobody voices an objection. Reviewers: mclow.lists Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D24895 llvm-svn: 282347
Diffstat (limited to 'libcxx/test/support')
-rw-r--r--libcxx/test/support/test_allocator.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/support/test_allocator.h b/libcxx/test/support/test_allocator.h
index 8b00feb9377..e73a353842b 100644
--- a/libcxx/test/support/test_allocator.h
+++ b/libcxx/test/support/test_allocator.h
@@ -66,7 +66,7 @@ public:
{
assert(data_ >= 0);
if (time_to_throw >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+#ifndef TEST_HAS_NO_EXCEPTIONS
throw std::bad_alloc();
#else
std::terminate();
@@ -130,7 +130,7 @@ public:
{
assert(data_ >= 0);
if (time_to_throw >= throw_after) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+#ifndef TEST_HAS_NO_EXCEPTIONS
throw std::bad_alloc();
#else
std::terminate();
@@ -221,10 +221,10 @@ public:
typedef std::true_type propagate_on_container_move_assignment;
typedef std::true_type propagate_on_container_swap;
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
+#if TEST_STD_VER < 11
std::size_t max_size() const
{return UINT_MAX / sizeof(T);}
-#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE
+#endif
};
OpenPOWER on IntegriCloud