[libcxx] r290472 - fix newly failing c++03 tests

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Fri Dec 23 18:40:45 2016
New Revision: 290472

URL: http://llvm.org/viewvc/llvm-project?rev=290472&view=rev
Log:
fix newly failing c++03 tests

Modified:
    libcxx/trunk/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
    libcxx/trunk/test/std/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp

Modified: libcxx/trunk/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp?rev=290472&r1=290471&r2=290472&view=diff
==============================================================================
--- libcxx/trunk/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp (original)
+++ libcxx/trunk/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp Fri Dec 23 18:40:45 2016
@@ -44,8 +44,9 @@ int test1 = 0;
 int test2 = 0;
 
 int runs = 0;
+bool expect_result = false;
 
-void f(bool expect_result)
+void f()
 {
     typedef std::chrono::system_clock Clock;
     typedef std::chrono::milliseconds milliseconds;
@@ -73,8 +74,9 @@ void f(bool expect_result)
 int main()
 {
     {
+        expect_result = true;
         L1 lk(m0);
-        std::thread t(f, /*expect_result*/true);
+        std::thread t(f);
         assert(test1 == 0);
         while (test1 == 0)
             cv.wait(lk);
@@ -87,8 +89,9 @@ int main()
     test1 = 0;
     test2 = 0;
     {
+        expect_result = false;
         L1 lk(m0);
-        std::thread t(f, /*expect_result*/false);
+        std::thread t(f);
         assert(test1 == 0);
         while (test1 == 0)
             cv.wait(lk);

Modified: libcxx/trunk/test/std/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp?rev=290472&r1=290471&r2=290472&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp Fri Dec 23 18:40:45 2016
@@ -57,6 +57,7 @@ constexpr decltype(std::placeholders::_1
 #endif // TEST_STD_VER >= 11
 
 void use_placeholders_to_prevent_unused_warning() {
+#if TEST_STD_VER >= 11
   ((void)cp1);
   ((void)cp2);
   ((void)cp3);
@@ -77,6 +78,7 @@ void use_placeholders_to_prevent_unused_
   ((void)default8);
   ((void)default9);
   ((void)default10);
+#endif
 }
 
 int main()