Renamed global variables to avoid name clashes with local variables.

This should silence MSVC warnings about local variables in various
places shadowing global variables in the tests.

Author: Lastique

test/sync/conditions/condition_variable/dtor_pass.cpp

@@ -23,42 +23,42 @@
 #include <boost/thread/locks.hpp>
 #include <boost/core/lightweight_test.hpp>
 
-boost::condition_variable* cv;
-boost::mutex m;
+boost::condition_variable* g_cv;
+boost::mutex g_mutex;
 typedef boost::unique_lock<boost::mutex> Lock;
 
 bool f_ready = false;
 bool g_ready = false;
 
 void f()
 {
-  Lock lk(m);
+  Lock lk(g_mutex);
   f_ready = true;
-  cv->notify_one();
-  cv->wait(lk);
-  delete cv;
+  g_cv->notify_one();
+  g_cv->wait(lk);
+  delete g_cv;
 }
 
 void g()
 {
-  Lock lk(m);
+  Lock lk(g_mutex);
   g_ready = true;
-  cv->notify_one();
+  g_cv->notify_one();
   while (!f_ready)
   {
-    cv->wait(lk);
+    g_cv->wait(lk);
   }
-  cv->notify_one();
+  g_cv->notify_one();
 }
 
 int main()
 {
-  cv = new boost::condition_variable;
+  g_cv = new boost::condition_variable;
   boost::thread th2(g);
-  Lock lk(m);
+  Lock lk(g_mutex);
   while (!g_ready)
   {
-    cv->wait(lk);
+    g_cv->wait(lk);
   }
   lk.unlock();
   boost::thread th1(f);

test/sync/conditions/condition_variable_any/dtor_pass.cpp

@@ -23,42 +23,42 @@
 #include <boost/thread/locks.hpp>
 #include <boost/core/lightweight_test.hpp>
 
-boost::condition_variable_any* cv;
-boost::timed_mutex m;
+boost::condition_variable_any* g_cv;
+boost::timed_mutex g_mutex;
 typedef boost::unique_lock<boost::timed_mutex> Lock;
 
 bool f_ready = false;
 bool g_ready = false;
 
 void f()
 {
-  Lock lk(m);
+  Lock lk(g_mutex);
   f_ready = true;
-  cv->notify_one();
-  cv->wait(lk);
-  delete cv;
+  g_cv->notify_one();
+  g_cv->wait(lk);
+  delete g_cv;
 }
 
 void g()
 {
-  Lock lk(m);
+  Lock lk(g_mutex);
   g_ready = true;
-  cv->notify_one();
+  g_cv->notify_one();
   while (!f_ready)
   {
-    cv->wait(lk);
+    g_cv->wait(lk);
   }
-  cv->notify_one();
+  g_cv->notify_one();
 }
 
 int main()
 {
-  cv = new boost::condition_variable_any;
+  g_cv = new boost::condition_variable_any;
   boost::thread th2(g);
-  Lock lk(m);
+  Lock lk(g_mutex);
   while (!g_ready)
   {
-    cv->wait(lk);
+    g_cv->wait(lk);
   }
   lk.unlock();
   boost::thread th1(f);

test/sync/futures/async/async_executor_pass.cpp

@@ -106,12 +106,12 @@ int f0()
   return 3;
 }
 
-int i = 0;
+int g_i = 0;
 
 int& f1()
 {
   boost::this_thread::sleep_for(ms(200));
-  return i;
+  return g_i;
 }
 
 void f2()

test/sync/futures/async/async_pass.cpp

@@ -109,12 +109,12 @@ int f0()
   return 3;
 }
 
-int i = 0;
+int g_i = 0;
 
 int& f1()
 {
   boost::this_thread::sleep_for(ms(200));
-  return i;
+  return g_i;
 }
 
 void f2()
@@ -153,8 +153,8 @@ struct check_timer {
   boost::chrono::nanoseconds delay;
   Clock::time_point start;
   check_timer(boost::chrono::nanoseconds delay)
-  : delay(delay)
-  , start(Clock::now())
+    : delay(delay)
+    , start(Clock::now())
   {
   }
   ~check_timer() {
@@ -490,7 +490,7 @@ int main()
         check_timer timer(ms(500));
         res = &f.get();
       }
-      BOOST_TEST(res == &i);
+      BOOST_TEST(res == &g_i);
     }
     catch (std::exception& ex)
     {
@@ -513,7 +513,7 @@ int main()
         check_timer timer(ms(500));
         res = &f.get();
       }
-      BOOST_TEST(res == &i);
+      BOOST_TEST(res == &g_i);
     }
     catch (std::exception& ex)
     {
@@ -536,7 +536,7 @@ int main()
         check_timer timer(ms(500));
         res = &f.get();
       }
-      BOOST_TEST(res == &i);
+      BOOST_TEST(res == &g_i);
     }
     catch (std::exception& ex)
     {
@@ -560,7 +560,7 @@ int main()
         check_timer timer(ms(500));
         res = &f.get();
       }
-      BOOST_TEST(res == &i);
+      BOOST_TEST(res == &g_i);
     }
     catch (std::exception& ex)
     {

test/sync/futures/future/get_or_pass.cpp

@@ -51,13 +51,13 @@ void func2(boost::promise<int> p)
     p.set_exception(::make_exception_ptr(3));
 }
 
-int j = 0;
+int g_j = 0;
 
 void func3(boost::promise<int&> p)
 {
     boost::this_thread::sleep_for(boost::chrono::milliseconds(500));
-    j = 5;
-    p.set_value(j);
+    g_j = 5;
+    p.set_value(g_j);
 }
 
 void func4(boost::promise<int&> p)

test/sync/futures/future/get_pass.cpp

@@ -61,13 +61,13 @@ void func2(boost::promise<int> p)
     p.set_exception(::make_exception_ptr(3));
 }
 
-int j = 0;
+int g_j = 0;
 
 void func3(boost::promise<int&> p)
 {
     boost::this_thread::sleep_for(boost::chrono::milliseconds(500));
-    j = 5;
-    p.set_value(j);
+    g_j = 5;
+    p.set_value(g_j);
 }
 
 void func4(boost::promise<int&> p)

test/sync/futures/future/move_assign_pass.cpp

@@ -23,9 +23,6 @@
 #include <boost/thread/future.hpp>
 #include <boost/core/lightweight_test.hpp>
 
-boost::mutex m0;
-boost::mutex m1;
-
 int main()
 {
   {

test/sync/futures/future/move_ctor_pass.cpp

@@ -23,8 +23,6 @@
 #include <boost/thread/future.hpp>
 #include <boost/core/lightweight_test.hpp>
 
-boost::mutex m;
-
 int main()
 {
   {
@@ -75,4 +73,3 @@ int main()
 
   return boost::report_errors();
 }
-

test/sync/futures/future/wait_for_pass.cpp

@@ -56,13 +56,13 @@ void func1(boost::promise<int> p)
   p.set_value(3);
 }
 
-int j = 0;
+int g_j = 0;
 
 void func3(boost::promise<int&> p)
 {
   boost::this_thread::sleep_for(ms(500));
-  j = 5;
-  p.set_value(j);
+  g_j = 5;
+  p.set_value(g_j);
 }
 
 void func5(boost::promise<void> p)

test/sync/futures/future/wait_pass.cpp

@@ -54,13 +54,13 @@ void func1(boost::promise<int> p)
   p.set_value(3);
 }
 
-int j = 0;
+int g_j = 0;
 
 void func3(boost::promise<int&> p)
 {
   boost::this_thread::sleep_for(ms(500));
-  j = 5;
-  p.set_value(j);
+  g_j = 5;
+  p.set_value(g_j);
 }
 
 void func5(boost::promise<void> p)