Revert "Revert "Merge to upstream r304942.""

This reverts commit 38a0d5af7e. Test: make checkbuild Test: ./run_tests.py Test: ./run_tests.py --bitness 64
2018-01-17 14:21:02 -08:00
parent 38a0d5af7e
commit c79549b70e
1102 changed files with 19092 additions and 14798 deletions
--- a/src/condition_variable.cpp
+++ b/src/condition_variable.cpp
@@ -14,6 +14,7 @@
 #include "condition_variable"
 #include "thread"
 #include "system_error"
+#include "__undef_macros"

 _LIBCPP_BEGIN_NAMESPACE_STD