Author: ericwf Date: Tue Jan 19 23:44:11 2016 New Revision: 258292 URL: http://llvm.org/viewvc/llvm-project?rev=258292&view=rev Log: Use TEST_STD_VER instead of __has_feature to detect noexcept. This fixes the test with GCC.
Modified: libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp Modified: libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp?rev=258292&r1=258291&r2=258292&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp (original) +++ libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp Tue Jan 19 23:44:11 2016 @@ -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 // _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits