diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-12-13 00:40:06 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-12-13 00:40:06 +0000 |
| commit | cb9c483551c537ed1fec0e746f30cfd32a9cf9cb (patch) | |
| tree | 7bacfce1b1bf0afbea40594ed8846677b0138198 /libstdc++-v3 | |
| parent | 3209451c3844a4302d520a1b06fe9f83c37a7fe4 (diff) | |
| download | gcc-cb9c483551c537ed1fec0e746f30cfd32a9cf9cb.tar.gz | |
2008-12-12 Benjamin Kosnik <bkoz@redhat.com>
* src/atomic.cc: Correct guards to match mutex.cc.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142735 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 36149efdf27..a9b95b1d61b 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 e2fe68f09bc..9e6444dcfe3 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; |