Author: hans
Date: Wed Jan 13 18:01:17 2016
New Revision: 257720
URL: http://llvm.org/viewvc/llvm-project?rev=257720&view=rev
Log:
Merging r257696:
------------------------------------------------------------------------
r257696 | marshall | 2016-01-13 14:52:36 -0800 (Wed, 13 Jan 2016) | 1 line
Fix test for C++03 - lacking noexcept
------------------------------------------------------------------------
Modified:
libcxx/branches/release_38/ (props changed)
libcxx/branches/release_38/test/libcxx/strings/iterators.exceptions.pass.cpp
Propchange: libcxx/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 13 18:01:17 2016
@@ -1,2 +1,2 @@
/libcxx/branches/apple:136569-137939
-/libcxx/trunk:257682
+/libcxx/trunk:257682,257696
Modified:
libcxx/branches/release_38/test/libcxx/strings/iterators.exceptions.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/libcxx/strings/iterators.exceptions.pass.cpp?rev=257720&r1=257719&r2=257720&view=diff
==============================================================================
---
libcxx/branches/release_38/test/libcxx/strings/iterators.exceptions.pass.cpp
(original)
+++
libcxx/branches/release_38/test/libcxx/strings/iterators.exceptions.pass.cpp
Wed Jan 13 18:01:17 2016
@@ -49,7 +49,11 @@ 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)
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
