diff options
author | Eric Fiselier <eric@efcs.ca> | 2016-01-20 05:44:11 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2016-01-20 05:44:11 +0000 |
commit | 48c3483f450c057613d1888ec1b0c27748f2a57f (patch) | |
tree | f894f909f2a068b7fe82a5817a8362b5c70e8282 /libcxx/test | |
parent | e612a8877a8370250c66f792f6f976aa546196ff (diff) | |
download | bcm5719-llvm-48c3483f450c057613d1888ec1b0c27748f2a57f.tar.gz bcm5719-llvm-48c3483f450c057613d1888ec1b0c27748f2a57f.zip |
Use TEST_STD_VER instead of __has_feature to detect noexcept. This fixes the test with GCC.
llvm-svn: 258292
Diffstat (limited to 'libcxx/test')
-rw-r--r-- | libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp index f039ced7c7a..7b7eaba0bb9 100644 --- a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp +++ b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp @@ -23,6 +23,7 @@ #include <vector> #include <initializer_list> +#include "test_macros.h" #include "test_iterators.h" int main() @@ -49,12 +50,12 @@ int main() static_assert((!std::__libcpp_string_gets_noexcept_iterator<random_access_iterator<char *> >::value), ""); static_assert((!std::__libcpp_string_gets_noexcept_iterator<ThrowingIterator <char *> >::value), ""); -#if __has_feature(cxx_noexcept) +#if TEST_STD_VER >= 11 static_assert(( std::__libcpp_string_gets_noexcept_iterator<NonThrowingIterator <char *> >::value), ""); #else static_assert((!std::__libcpp_string_gets_noexcept_iterator<NonThrowingIterator <char *> >::value), ""); #endif - + // // iterators from libc++'s containers // |