2011-07-21 Paolo Carlini <paolo.carlini@oracle.com>

	* include/std/mutex (timed_mutex, recursive_timed_mutex): Update
	to use steady_clock instead of monotonic_clock.
	* config/abi/pre/gnu.ver: Export steady_clock::now.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@176560 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae00203..3d36859 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/std/mutex (timed_mutex, recursive_timed_mutex): Update
+       to use steady_clock instead of monotonic_clock.
+       * config/abi/pre/gnu.ver: Export steady_clock::now.
+
 2011-07-20  Benjamin Kosnik  <bkoz@redhat.com>
            Daniel Krugler  <daniel.kruegler@googlemail.com>
 

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 6c07e61..3d797a8 100644 (file)
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1289,6 +1289,9 @@ GLIBCXX_3.4.17 {
     _ZN11__gnu_debug29_Safe_unordered_sequence_base13_M_detach_allEv;
     _ZN11__gnu_debug25_Safe_local_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb;
     _ZN11__gnu_debug25_Safe_local_iterator_base9_M_detachEv;
+
+    # std::chrono::steady_clock::now()
+    _ZNSt6chrono12steady_clock3nowEv;
 } GLIBCXX_3.4.16;
 
 # Symbols in the support library (libsupc++) have their own tag.

diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index 1c66afc..1840117 100644 (file)
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -212,7 +212,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     typedef __gthread_mutex_t                  __native_type;
 
 #ifdef _GLIBCXX_USE_CLOCK_MONOTONIC
-    typedef chrono::monotonic_clock            __clock_t;
+    typedef chrono::steady_clock               __clock_t;
 #else
     typedef chrono::high_resolution_clock      __clock_t;
 #endif
@@ -317,7 +317,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     typedef __gthread_recursive_mutex_t                __native_type;
 
 #ifdef _GLIBCXX_USE_CLOCK_MONOTONIC
-    typedef chrono::monotonic_clock            __clock_t;
+    typedef chrono::steady_clock               __clock_t;
 #else
     typedef chrono::high_resolution_clock      __clock_t;
 #endif