summaryrefslogtreecommitdiffstats
path: root/libcxx/include/scoped_allocator
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/include/scoped_allocator
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/include/scoped_allocator')
-rw-r--r--libcxx/include/scoped_allocator4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator
index 9436dac9c19..04e73864590 100644
--- a/libcxx/include/scoped_allocator
+++ b/libcxx/include/scoped_allocator
@@ -115,7 +115,7 @@ template <class OuterA1, class OuterA2, class... InnerAllocs>
_LIBCPP_BEGIN_NAMESPACE_STD
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE)
+#if !defined(_LIBCPP_CXX03_LANG)
// scoped_allocator_adaptor
@@ -597,7 +597,7 @@ operator!=(const scoped_allocator_adaptor<_OuterA1, _InnerAllocs...>& __a,
return !(__a == __b);
}
-#endif // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE)
+#endif // !defined(_LIBCPP_CXX03_LANG)
_LIBCPP_END_NAMESPACE_STD
OpenPOWER on IntegriCloud