Index: win32/condition_variable.hpp
===================================================================
--- win32/condition_variable.hpp	(revision 79165)
+++ win32/condition_variable.hpp	(working copy)
@@ -314,14 +314,14 @@
         }
 
 
-        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until)
+        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& p_wait_until)
         {
-            return do_wait(m,wait_until);
+            return do_wait(m,p_wait_until);
         }
 
-        bool timed_wait(unique_lock<mutex>& m,boost::xtime const& wait_until)
+        bool timed_wait(unique_lock<mutex>& m,boost::xtime const& p_wait_until)
         {
-            return do_wait(m,system_time(wait_until));
+            return do_wait(m,system_time(p_wait_until));
         }
         template<typename duration_type>
         bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration)
@@ -330,14 +330,14 @@
         }
 
         template<typename predicate_type>
-        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until,predicate_type pred)
+        bool timed_wait(unique_lock<mutex>& m,boost::system_time const& p_wait_until,predicate_type pred)
         {
-            return do_wait(m,wait_until,pred);
+            return do_wait(m,p_wait_until,pred);
         }
         template<typename predicate_type>
-        bool timed_wait(unique_lock<mutex>& m,boost::xtime const& wait_until,predicate_type pred)
+        bool timed_wait(unique_lock<mutex>& m,boost::xtime const& p_wait_until,predicate_type pred)
         {
-            return do_wait(m,system_time(wait_until),pred);
+            return do_wait(m,system_time(p_wait_until),pred);
         }
         template<typename duration_type,typename predicate_type>
         bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration,predicate_type pred)
@@ -422,15 +422,15 @@
         }
 
         template<typename lock_type>
-        bool timed_wait(lock_type& m,boost::system_time const& wait_until)
+        bool timed_wait(lock_type& m,boost::system_time const& p_wait_until)
         {
-            return do_wait(m,wait_until);
+            return do_wait(m,p_wait_until);
         }
 
         template<typename lock_type>
-        bool timed_wait(lock_type& m,boost::xtime const& wait_until)
+        bool timed_wait(lock_type& m,boost::xtime const& p_wait_until)
         {
-            return do_wait(m,system_time(wait_until));
+            return do_wait(m,system_time(p_wait_until));
         }
 
         template<typename lock_type,typename duration_type>
@@ -440,15 +440,15 @@
         }
 
         template<typename lock_type,typename predicate_type>
-        bool timed_wait(lock_type& m,boost::system_time const& wait_until,predicate_type pred)
+        bool timed_wait(lock_type& m,boost::system_time const& p_wait_until,predicate_type pred)
         {
-            return do_wait(m,wait_until,pred);
+            return do_wait(m,p_wait_until,pred);
         }
 
         template<typename lock_type,typename predicate_type>
-        bool timed_wait(lock_type& m,boost::xtime const& wait_until,predicate_type pred)
+        bool timed_wait(lock_type& m,boost::xtime const& p_wait_until,predicate_type pred)
         {
-            return do_wait(m,system_time(wait_until),pred);
+            return do_wait(m,system_time(p_wait_until),pred);
         }
 
         template<typename lock_type,typename duration_type,typename predicate_type>