diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-01-27 11:12:04 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-01-27 11:12:04 +0000 |
| commit | 506f03c370e7cc6658a1aeb291a1a5b3d6143000 (patch) | |
| tree | 7d15096d2ba2e08e32e469edabcaeb051a72699e | |
| parent | f962fbf14c2fba5d5195cb4094f13e76f901f709 (diff) | |
| download | gcc-506f03c370e7cc6658a1aeb291a1a5b3d6143000.zip gcc-506f03c370e7cc6658a1aeb291a1a5b3d6143000.tar.gz gcc-506f03c370e7cc6658a1aeb291a1a5b3d6143000.tar.bz2 | |
re PR target/64368 (Several libstdc++ test failures on non-linux platforms after r218964.)
PR libstdc++/64368
* include/std/shared_mutex (shared_timed_mutex::try_lock_for,
shared_timed_mutex::try_lock_until): Only define when POSIX thread
timeouts option is supported.
(shared_timed_mutex::try_shared_lock_for,
shared_timed_mutex::try_shared_lock_until): Likewise.
From-SVN: r220161
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/shared_mutex | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4cdcd14..169f02e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2015-01-27 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/64368 + * include/std/shared_mutex (shared_timed_mutex::try_lock_for, + shared_timed_mutex::try_lock_until): Only define when POSIX thread + timeouts option is supported. + (shared_timed_mutex::try_shared_lock_for, + shared_timed_mutex::try_shared_lock_until): Likewise. + 2015-01-26 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/64368 diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex index 643768c..47cfc64 100644 --- a/libstdc++-v3/include/std/shared_mutex +++ b/libstdc++-v3/include/std/shared_mutex @@ -108,6 +108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return true; } +#if _GTHREAD_USE_MUTEX_TIMEDLOCK template<typename _Rep, typename _Period> bool try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time) @@ -149,6 +150,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const auto __s_atime = __s_entry + __delta; return try_lock_until(__s_atime); } +#endif void unlock() @@ -186,6 +188,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return true; } +#if _GTHREAD_USE_MUTEX_TIMEDLOCK template<typename _Rep, typename _Period> bool try_lock_shared_for(const chrono::duration<_Rep, _Period>& __rel_time) @@ -230,6 +233,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const auto __s_atime = __s_entry + __delta; return try_lock_shared_until(__s_atime); } +#endif void unlock_shared() |