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/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//

+// XFAIL: libcpp-no-exceptions
 // <regex>

 // template <class charT, class traits = regex_traits<charT>> class basic_regex;
@@ -16,6 +17,7 @@

 #include <regex>
 #include <cassert>
+#include "test_macros.h"

 static bool error_badrepeat_thrown(const char *pat) 
 {