Revert "Revert "Update aosp/master libcxx rebase to r263688""

This reverts commit 1d4a1edbc7. Change-Id: I2909937fe582f2c5552bc86e7f4d2d5cff0de0aa
2016-06-08 22:25:43 +00:00
parent 1d4a1edbc7
commit ee226c05af
1396 changed files with 38992 additions and 11535 deletions
--- a/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp
+++ b/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//

+// UNSUPPORTED: c++98, c++03
+
 // <string>

 // basic_string(basic_string&&)
@@ -29,7 +31,6 @@ struct some_alloc

 int main()
 {
-#if __has_feature(cxx_noexcept)
    {
        typedef std::string C;
        static_assert(std::is_nothrow_move_constructible<C>::value, "");
@@ -46,5 +47,4 @@ int main()
        static_assert( std::is_nothrow_move_constructible<C>::value, "");
 #endif
    }
-#endif
 }