diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2008-12-13 00:40:06 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2008-12-13 00:40:06 +0000 |
| commit | b0c2c850bd1a715b2b30e21323476e8e9216a572 (patch) | |
| tree | 7bacfce1b1bf0afbea40594ed8846677b0138198 | |
| parent | d9db9855de30d4394b7855ef0833c6bd89704205 (diff) | |
| download | gcc-b0c2c850bd1a715b2b30e21323476e8e9216a572.zip gcc-b0c2c850bd1a715b2b30e21323476e8e9216a572.tar.gz gcc-b0c2c850bd1a715b2b30e21323476e8e9216a572.tar.bz2 | |
atomic.cc: Correct guards to match mutex.cc.
2008-12-12 Benjamin Kosnik <bkoz@redhat.com>
* src/atomic.cc: Correct guards to match mutex.cc.
From-SVN: r142735
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/atomic.cc | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 36149ef..a9b95b1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2008-12-12 Benjamin Kosnik <bkoz@redhat.com> + + * src/atomic.cc: Correct guards to match mutex.cc. + 2008-12-11 Benjamin Kosnik <bkoz@redhat.com> Richard Henderson <rth@redhat.com> diff --git a/libstdc++-v3/src/atomic.cc b/libstdc++-v3/src/atomic.cc index e2fe68f..9e6444d 100644 --- a/libstdc++-v3/src/atomic.cc +++ b/libstdc++-v3/src/atomic.cc @@ -36,7 +36,7 @@ namespace { -#ifdef _GLIBCXX_HAS_GTHREADS +#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) std::mutex atomic_mutex; #endif @@ -56,7 +56,7 @@ namespace std bool atomic_flag::test_and_set(memory_order) volatile { -#ifdef _GLIBCXX_HAS_GTHREADS +#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) lock_guard<mutex> __lock(atomic_mutex); #endif bool result = _M_i; @@ -67,7 +67,7 @@ namespace std void atomic_flag::clear(memory_order) volatile { -#ifdef _GLIBCXX_HAS_GTHREADS +#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) lock_guard<mutex> __lock(atomic_mutex); #endif _M_i = false; |