Author: hans Date: Wed Jan 13 18:02:08 2016 New Revision: 257721 URL: http://llvm.org/viewvc/llvm-project?rev=257721&view=rev Log: Merging r257702: ------------------------------------------------------------------------ r257702 | marshall | 2016-01-13 15:05:15 -0800 (Wed, 13 Jan 2016) | 1 line
Better comments in test. NFC ------------------------------------------------------------------------ Modified: libcxx/branches/release_38/ (props changed) libcxx/branches/release_38/test/libcxx/strings/iterators.noexcept.pass.cpp Propchange: libcxx/branches/release_38/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 13 18:02:08 2016 @@ -1,2 +1,2 @@ /libcxx/branches/apple:136569-137939 -/libcxx/trunk:257682,257696 +/libcxx/trunk:257682,257696,257702 Modified: libcxx/branches/release_38/test/libcxx/strings/iterators.noexcept.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_38/test/libcxx/strings/iterators.noexcept.pass.cpp?rev=257721&r1=257720&r2=257721&view=diff ============================================================================== --- libcxx/branches/release_38/test/libcxx/strings/iterators.noexcept.pass.cpp (original) +++ libcxx/branches/release_38/test/libcxx/strings/iterators.noexcept.pass.cpp Wed Jan 13 18:02:08 2016 @@ -14,7 +14,9 @@ // __libcpp_string_gets_noexcept_iterator determines if an iterator can be used // w/o worrying about whether or not certain operations can throw. -// This gives us a "fast path for string operations" +// This gives us a "fast path for string operations". +// +// When exceptions are disabled, all iterators should get this "fast path" // #define _LIBCPP_NO_EXCEPTIONS @@ -44,7 +46,6 @@ int main() static_assert(( std::__libcpp_string_gets_noexcept_iterator<std::reverse_iterator<std::__wrap_iter<char *> > > ::value), ""); // iterators in the libc++ test suite -// Since we have turned off exceptions, they're all noexcept static_assert(( std::__libcpp_string_gets_noexcept_iterator<output_iterator <char *> >::value), ""); static_assert(( std::__libcpp_string_gets_noexcept_iterator<input_iterator <char *> >::value), ""); static_assert(( std::__libcpp_string_gets_noexcept_iterator<forward_iterator <char *> >::value), ""); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits