Revert "Merge to upstream r304942."

This reverts commit 83b1388ecd, reversing changes made to f20819f925. Test: treehugger Bug: None
2018-01-11 10:41:39 -08:00
parent ef7d5b4347
commit 38a0d5af7e
1110 changed files with 15077 additions and 19371 deletions
--- a/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
+++ b/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
@@ -188,7 +188,7 @@ int main()
        }
    }
 #endif
-#if TEST_STD_VER >= 11
+#ifndef _LIBCPP_HAS_NO_VARIADICS
    {
        L0 l0;
        L0 l1;
@@ -518,5 +518,5 @@ int main()
        }
    }
 #endif  // TEST_HAS_NO_EXCEPTIONS
-#endif // TEST_STD_VER >= 11
+#endif  // _LIBCPP_HAS_NO_VARIADICS
 }