diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2009-10-16 07:47:33 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2009-10-16 07:47:33 +0000 |
| commit | 3808dfec58ef17c44b36dda7c2bb590580f6d8fc (patch) | |
| tree | cdc799eed07c90fa504ba1d50d068b242f48f2e6 /libstdc++-v3/include | |
| parent | a3e1ddfc645871eeddc703d8f17f2014197d3f5c (diff) | |
| download | gcc-3808dfec58ef17c44b36dda7c2bb590580f6d8fc.zip gcc-3808dfec58ef17c44b36dda7c2bb590580f6d8fc.tar.gz gcc-3808dfec58ef17c44b36dda7c2bb590580f6d8fc.tar.bz2 | |
re PR libstdc++/40654 ([C++0x] atomic.cc: 'd' is used uninitialized warning)
2009-10-15 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/40654
PR libstdc++/40826
* src/atomic.cc (atomic_flag_test_and_set_explicit): Add
static_cast from base to derived.
(atomic_flag_clear_explicit): Same.
* include/bits/atomic_2.h (__atomic2::atomic_flag): Public derivation.
Remove value type constructor.
* include/bits/atomic_0.h (__atomic0::atomic_flag): Same.
* include/std/future (_Future_state): Use ATOMIC_FLAG_INIT to
initialized the atomic_flag member.
From-SVN: r152895
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_0.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_2.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/future | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/atomic_0.h b/libstdc++-v3/include/bits/atomic_0.h index a493ea6..0caffaf 100644 --- a/libstdc++-v3/include/bits/atomic_0.h +++ b/libstdc++-v3/include/bits/atomic_0.h @@ -82,14 +82,15 @@ namespace __atomic0 __r; }) /// atomic_flag - struct atomic_flag : private __atomic_flag_base + struct atomic_flag : public __atomic_flag_base { atomic_flag() = default; ~atomic_flag() = default; atomic_flag(const atomic_flag&) = delete; atomic_flag& operator=(const atomic_flag&) = delete; - atomic_flag(bool __i) { _M_i = __i; } // XXX deleted copy ctor != agg + // Conversion to ATOMIC_FLAG_INIT. + atomic_flag(bool __i): __atomic_flag_base({ __i }) { } bool test_and_set(memory_order __m = memory_order_seq_cst) volatile; diff --git a/libstdc++-v3/include/bits/atomic_2.h b/libstdc++-v3/include/bits/atomic_2.h index 8e8e7ff..d39adb9 100644 --- a/libstdc++-v3/include/bits/atomic_2.h +++ b/libstdc++-v3/include/bits/atomic_2.h @@ -44,14 +44,15 @@ namespace __atomic2 { /// atomic_flag - struct atomic_flag : private __atomic_flag_base + struct atomic_flag : public __atomic_flag_base { atomic_flag() = default; ~atomic_flag() = default; atomic_flag(const atomic_flag&) = delete; atomic_flag& operator=(const atomic_flag&) = delete; - atomic_flag(bool __i) { _M_i = __i; } // XXX deleted copy ctor != agg + // Conversion to ATOMIC_FLAG_INIT. + atomic_flag(bool __i): __atomic_flag_base({ __i }) { } bool test_and_set(memory_order __m = memory_order_seq_cst) volatile diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index badb6e0..f922dcd 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -150,7 +150,7 @@ namespace std typedef _Future_ptr<_Future_result_base>::type _Future_ptr_type; public: - _Future_state() : _M_result(), _M_retrieved(false) { } + _Future_state() : _M_result(), _M_retrieved(ATOMIC_FLAG_INIT) { } _Future_state(const _Future_state&) = delete; _Future_state& operator=(const _Future_state&) = delete; |