Message ID | BANLkTi=4+SxZ1+wJbjZkGXEjy28YZsKLYQ@mail.gmail.com |
---|---|
State | New |
Headers | show |
Hi, > That only shows up if you configure with --enable-libstcxx-time > > I'll finish reg-testing it and submit it when I get home this evening. thanks Jon. Looks like we have also to fix parallel-mode (49187), I hope there isn't too much to reshuffle, if you spot something... Thanks again, Paolo.
On 27 May 2011 09:30, Jonathan Wakely wrote: > > I think this piece is also needed due to the fix for 29131: > > Index: include/std/thread > =================================================================== > --- include/std/thread (revision 174307) > +++ include/std/thread (working copy) > @@ -260,12 +260,6 @@ > #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 @@ > > ::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 > > That only shows up if you configure with --enable-libstcxx-time > > I'll finish reg-testing it and submit it when I get home this evening. > 2011-05-27 Jonathan Wakely <jwakely.gcc@gmail.com> * include/std/thread (this_thread::sleep_until): Move after sleep_for. Committed to trunk
Index: include/std/thread =================================================================== --- include/std/thread (revision 174307) +++ include/std/thread (working copy) @@ -260,12 +260,6 @@ #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 @@ ::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