From b0c2c850bd1a715b2b30e21323476e8e9216a572 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Sat, 13 Dec 2008 00:40:06 +0000 Subject: [PATCH] atomic.cc: Correct guards to match mutex.cc. 2008-12-12 Benjamin Kosnik * src/atomic.cc: Correct guards to match mutex.cc. From-SVN: r142735 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/src/atomic.cc | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 36149efdf27d..a9b95b1d61b9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2008-12-12 Benjamin Kosnik + + * src/atomic.cc: Correct guards to match mutex.cc. + 2008-12-11 Benjamin Kosnik Richard Henderson diff --git a/libstdc++-v3/src/atomic.cc b/libstdc++-v3/src/atomic.cc index e2fe68f09bc4..9e6444dcfe37 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 __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 __lock(atomic_mutex); #endif _M_i = false; -- 2.47.3