Merge to upstream r304942.

Test: make checkbuild Test: ./run_tests.py Bug: None Change-Id: Ife00da6e2ce8d030886fd9a94d0417e0db784222
2018-01-08 22:54:33 -08:00
parent f20819f925 276a69c18b
commit 83b1388ecd
1102 changed files with 19092 additions and 14798 deletions
--- a/src/ios.cpp
+++ b/src/ios.cpp
@@ -25,6 +25,7 @@
 #include "new"
 #include "streambuf"
 #include "string"
+#include "__undef_macros"

 _LIBCPP_BEGIN_NAMESPACE_STD