From 1c3313bd0215c89fb38710a1ea0762ccf32e859c Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 20 Apr 2017 21:21:10 +0000 Subject: Vendor import of libc++ trunk r300890: https://llvm.org/svn/llvm-project/libcxx/trunk@300890 --- test/libcxx/containers/sequences/vector/asan_throw.pass.cpp | 9 +++++---- test/libcxx/iterators/trivial_iterators.pass.cpp | 2 +- test/libcxx/strings/iterators.exceptions.pass.cpp | 2 +- test/libcxx/strings/iterators.noexcept.pass.cpp | 3 ++- .../meta.unary/meta.unary.prop/__has_operator_addressof.pass.cpp | 6 ++---- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'test/libcxx') diff --git a/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp b/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp index 43324e9418f96..30cf3f42e9021 100644 --- a/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp +++ b/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "asan_testing.h" class X { @@ -70,7 +71,7 @@ void test_push_back() { } void test_emplace_back() { -#ifndef _LIBCPP_HAS_NO_VARIADICS +#if TEST_STD_VER >= 11 std::vector v; v.reserve(2); v.push_back(X(2)); @@ -83,7 +84,7 @@ void test_emplace_back() { } assert(v.size() == 1); assert(is_contiguous_container_asan_correct(v)); -#endif // _LIBCPP_HAS_NO_VARIADICS +#endif } void test_insert_range() { @@ -121,7 +122,7 @@ void test_insert() { } void test_emplace() { -#ifndef _LIBCPP_HAS_NO_VARIADICS +#if TEST_STD_VER >= 11 std::vector v; v.reserve(3); v.insert(v.end(), X(1)); @@ -135,7 +136,7 @@ void test_emplace() { } assert(v.size() == 2); assert(is_contiguous_container_asan_correct(v)); -#endif // _LIBCPP_HAS_NO_VARIADICS +#endif } void test_insert_range2() { diff --git a/test/libcxx/iterators/trivial_iterators.pass.cpp b/test/libcxx/iterators/trivial_iterators.pass.cpp index d924a57ffeab5..fa3ebf2604863 100644 --- a/test/libcxx/iterators/trivial_iterators.pass.cpp +++ b/test/libcxx/iterators/trivial_iterators.pass.cpp @@ -179,7 +179,7 @@ int main() static_assert(( std::__libcpp_is_trivial_iterator::reverse_iterator> ::value), ""); static_assert(( std::__libcpp_is_trivial_iterator::const_reverse_iterator>::value), ""); -#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS +#if TEST_STD_VER >= 11 // Initializer list (which has no reverse iterators) static_assert(( std::__libcpp_is_trivial_iterator::iterator> ::value), ""); static_assert(( std::__libcpp_is_trivial_iterator::const_iterator> ::value), ""); diff --git a/test/libcxx/strings/iterators.exceptions.pass.cpp b/test/libcxx/strings/iterators.exceptions.pass.cpp index b236c5180b936..7dea53c4c3e94 100644 --- a/test/libcxx/strings/iterators.exceptions.pass.cpp +++ b/test/libcxx/strings/iterators.exceptions.pass.cpp @@ -80,7 +80,7 @@ int main() static_assert(( std::__libcpp_string_gets_noexcept_iterator::reverse_iterator> ::value), ""); static_assert(( std::__libcpp_string_gets_noexcept_iterator::const_reverse_iterator>::value), ""); -#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS +#if TEST_STD_VER >= 11 // Initializer list (which has no reverse iterators) static_assert(( std::__libcpp_string_gets_noexcept_iterator::iterator> ::value), ""); static_assert(( std::__libcpp_string_gets_noexcept_iterator::const_iterator> ::value), ""); diff --git a/test/libcxx/strings/iterators.noexcept.pass.cpp b/test/libcxx/strings/iterators.noexcept.pass.cpp index b8e0b4cdf34d5..20b4e3d769e56 100644 --- a/test/libcxx/strings/iterators.noexcept.pass.cpp +++ b/test/libcxx/strings/iterators.noexcept.pass.cpp @@ -28,6 +28,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" int main() @@ -72,7 +73,7 @@ int main() static_assert(( std::__libcpp_string_gets_noexcept_iterator::reverse_iterator> ::value), ""); static_assert(( std::__libcpp_string_gets_noexcept_iterator::const_reverse_iterator>::value), ""); -#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS +#if TEST_STD_VER >= 11 // Initializer list (which has no reverse iterators) static_assert(( std::__libcpp_string_gets_noexcept_iterator::iterator> ::value), ""); static_assert(( std::__libcpp_string_gets_noexcept_iterator::const_iterator> ::value), ""); diff --git a/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/__has_operator_addressof.pass.cpp b/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/__has_operator_addressof.pass.cpp index 1c715e04970c7..886884234b469 100644 --- a/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/__has_operator_addressof.pass.cpp +++ b/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/__has_operator_addressof.pass.cpp @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + // type_traits // extension @@ -16,7 +18,6 @@ #include -#ifndef _LIBCPP_HAS_NO_CONSTEXPR struct A { @@ -54,11 +55,9 @@ struct J constexpr J* operator&() const &&; }; -#endif // _LIBCPP_HAS_NO_CONSTEXPR int main() { -#ifndef _LIBCPP_HAS_NO_CONSTEXPR static_assert(std::__has_operator_addressof::value == false, ""); static_assert(std::__has_operator_addressof::value == false, ""); static_assert(std::__has_operator_addressof::value == true, ""); @@ -67,5 +66,4 @@ int main() static_assert(std::__has_operator_addressof::value == true, ""); static_assert(std::__has_operator_addressof::value == true, ""); static_assert(std::__has_operator_addressof::value == true, ""); -#endif // _LIBCPP_HAS_NO_CONSTEXPR } -- cgit v1.2.3