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.traits/imbue.pass.cpp
+++ b/test/std/re/re.traits/imbue.pass.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//

+// REQUIRES: locale.en_US.UTF-8
+
 // <regex>

 // template <class charT> struct regex_traits;
@@ -17,6 +19,7 @@
 #include <locale>
 #include <cassert>

+#include "test_macros.h"
 #include "platform_support.h" // locale name macros

 int main()