[Boost-commit] svn:boost r79794 - branches/release/boost/thread/win32

Subject: [Boost-commit] svn:boost r79794 - branches/release/boost/thread/win32
From: andrey.semashev_at_[hidden]
Date: 2012-07-29 04:44:24

Author: andysem
Date: 2012-07-29 04:44:22 EDT (Sun, 29 Jul 2012)
New Revision: 79794
URL: http://svn.boost.org/trac/boost/changeset/79794

Log:
Merged changes from trunk.
Text files modified: 
   branches/release/boost/thread/win32/basic_timed_mutex.hpp |     2 ++                                      
   branches/release/boost/thread/win32/shared_mutex.hpp      |     5 ++++-                                   
   branches/release/boost/thread/win32/thread_primitives.hpp |     3 ++-                                     
   3 files changed, 8 insertions(+), 2 deletions(-)

Modified: branches/release/boost/thread/win32/basic_timed_mutex.hpp
==============================================================================
--- branches/release/boost/thread/win32/basic_timed_mutex.hpp	(original)
+++ branches/release/boost/thread/win32/basic_timed_mutex.hpp	2012-07-29 04:44:22 EDT (Sun, 29 Jul 2012)
@@ -159,6 +159,7 @@
                 return timed_lock(system_time(timeout));
             }
 
+#ifdef BOOST_THREAD_USES_CHRONO
             template <class Rep, class Period>
             bool try_lock_for(const chrono::duration<Rep, Period>& rel_time)
             {
@@ -209,6 +210,7 @@
               }
               return true;
             }
+#endif
 
             void unlock()
             {

Modified: branches/release/boost/thread/win32/shared_mutex.hpp
==============================================================================
--- branches/release/boost/thread/win32/shared_mutex.hpp	(original)
+++ branches/release/boost/thread/win32/shared_mutex.hpp	2012-07-29 04:44:22 EDT (Sun, 29 Jul 2012)
@@ -221,6 +221,7 @@
             }
         }
 
+#ifdef BOOST_THREAD_USES_CHRONO
         template <class Rep, class Period>
         bool try_lock_shared_for(const chrono::duration<Rep, Period>& rel_time)
         {
@@ -327,6 +328,7 @@
             BOOST_ASSERT(res==0);
           }
         }
+#endif
 
         void unlock_shared()
         {
@@ -490,7 +492,7 @@
             }
         }
 
-
+#ifdef BOOST_THREAD_USES_CHRONO
         template <class Rep, class Period>
         bool try_lock_for(const chrono::duration<Rep, Period>& rel_time)
         {
@@ -598,6 +600,7 @@
             BOOST_ASSERT(wait_res<2);
           }
         }
+#endif
 
         void unlock()
         {

Modified: branches/release/boost/thread/win32/thread_primitives.hpp
==============================================================================
--- branches/release/boost/thread/win32/thread_primitives.hpp	(original)
+++ branches/release/boost/thread/win32/thread_primitives.hpp	2012-07-29 04:44:22 EDT (Sun, 29 Jul 2012)
@@ -376,7 +376,8 @@
                 };
                 return ret;
 
-#endif            }
+#endif
+            }
 
         }
     }