2011-05-27 Jonathan Wakely <jwakely.gcc@gmail.com>

	* include/std/thread (this_thread::sleep_until): Move after sleep_for.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5be06f5..e5915c1 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-27  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * include/std/thread (this_thread::sleep_until): Move after sleep_for.
+
 2011-05-27  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/49187

diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread
index 4fa5e50..e7a9b14 100644 (file)
--- a/libstdc++-v3/include/std/thread
+++ b/libstdc++-v3/include/std/thread
@@ -260,12 +260,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
 #endif
 
 #ifdef _GLIBCXX_USE_NANOSLEEP
-    /// sleep_until
-    template<typename _Clock, typename _Duration>
-      inline void
-      sleep_until(const chrono::time_point<_Clock, _Duration>& __atime)
-      { sleep_for(__atime - _Clock::now()); }
-
     /// sleep_for
     template<typename _Rep, typename _Period>
       inline void
@@ -285,6 +279,12 @@ _GLIBCXX_END_NAMESPACE_VERSION
 
        ::nanosleep(&__ts, 0);
       }
+
+    /// sleep_until
+    template<typename _Clock, typename _Duration>
+      inline void
+      sleep_until(const chrono::time_point<_Clock, _Duration>& __atime)
+      { sleep_for(__atime - _Clock::now()); }
 #endif
 
   _GLIBCXX_END_NAMESPACE_VERSION