diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-08 09:44:57 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-08 09:44:57 +0000 |
| commit | e11c67d07882cd920df5357ef8612e9c3cae5fea (patch) | |
| tree | ffa845dbce459568e9c10113059b153f10283e4f /libstdc++-v3/include/std/atomic | |
| parent | e3694d1dc050cd9d8d66ac56810a66abc138d4b7 (diff) | |
| download | ppe42-gcc-e11c67d07882cd920df5357ef8612e9c3cae5fea.tar.gz ppe42-gcc-e11c67d07882cd920df5357ef8612e9c3cae5fea.zip | |
* include/bits/atomic_base.h (__calculate_memory_order): Rename to...
(__cmpexch_failure_order): This, and rewrite as constexpr function.
(compare_exchange_strong, compare_exchange_weak): Use it.
* include/std/atomic (compare_exchange_strong, compare_exchange_weak):
Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182105 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/atomic')
| -rw-r--r-- | libstdc++-v3/include/std/atomic | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 70f613f5c50..31673e96a7c 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -408,7 +408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION memory_order __m = memory_order_seq_cst) noexcept { return compare_exchange_weak(__p1, __p2, __m, - __calculate_memory_order(__m)); + __cmpexch_failure_order(__m)); } bool @@ -416,7 +416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION memory_order __m = memory_order_seq_cst) volatile noexcept { return compare_exchange_weak(__p1, __p2, __m, - __calculate_memory_order(__m)); + __cmpexch_failure_order(__m)); } bool @@ -435,7 +435,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION memory_order __m = memory_order_seq_cst) noexcept { return _M_b.compare_exchange_strong(__p1, __p2, __m, - __calculate_memory_order(__m)); + __cmpexch_failure_order(__m)); } bool @@ -443,7 +443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION memory_order __m = memory_order_seq_cst) volatile noexcept { return _M_b.compare_exchange_strong(__p1, __p2, __m, - __calculate_memory_order(__m)); + __cmpexch_failure_order(__m)); } __pointer_type |
