diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2006-09-14 09:48:15 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2006-09-14 09:48:15 +0000 |
| commit | 2e362c747413dc3767d020f522df127964b275ac (patch) | |
| tree | eef2837703208f056261f360e2ea7f39d3036693 /libstdc++-v3/src/debug.cc | |
| parent | 06fcf75439fbafae348fa33a0630f7bd83a835aa (diff) | |
| download | gcc-2e362c747413dc3767d020f522df127964b275ac.zip gcc-2e362c747413dc3767d020f522df127964b275ac.tar.gz gcc-2e362c747413dc3767d020f522df127964b275ac.tar.bz2 | |
atomicity.h: Move to...
2006-09-13 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/atomicity.h: Move to...
* include/ext/atomicity.h: ...here.
* include/bits/concurrence.h: Move to...
* include/ext/concurrence.h: ...here.
* include/Makefile.am (ext_headers): Additions.
(bits_headers): Subtractions.
* include/Makefile.in: Regenerate.
* include/ext/bitmap_allocator.h (_Mutex), __threads_enabled,
_Lock, _Auto_Lock): Subsume into...
* include/bits/concurrence.h (__mutex): ..this. Error check
locking and unlocking.
(lock): Uglify to...
(__scoped_lock): Use __mutex.
(__glibcxx_mutex_define_initialized): Remove.
(__glibcxx_mutex_type): Remove.
* include/tr1/boost_shared_ptr.h: Formating tweaks, adjustments.
(_Lock_policy): Move from here...
* include/ext/concurrence.h: ... to here.
(__shared_ptr_default_lock_mode): To __default_lock_policy.
(_S_lockfree): To _S_atomic.
Document.
* libsupc++/guard.cc (static_mutex): Subsume into and fixup for...
* include/ext/concurrence.h (__recursive_mutex): ...this. Error
check locking and unlocking.
* libsupc++/eh_alloc.cc: Use __scoped_lock.
* config/os/aix/atomicity.h: Fixups for include paths, mutex to
__scoped_mutex change, removal of locking defines.
* config/os/irix/atomicity.h: Same.
* config/cpu/cris/atomicity.h: Same.
* config/cpu/m68k/atomicity.h: Same.
* config/cpu/hppa/atomicity.h: Same.
* config/cpu/mips/atomicity.h: Same.
* config/cpu/sparc/atomicity.h: Same.
* config/cpu/i386/atomicity.h: Same.
* config/cpu/i486/atomicity.h: Same.
* config/cpu/sh/atomicity.h: Same.
* config/cpu/generic/atomicity_mutex/atomicity.h: Same.
* include/ext/pool_allocator.h: Same.
* include/ext/bitmap_allocator.h: Same.
* include/ext/rc_string_base.h: Same.
* include/ext/mt_allocator.h: Same.
* include/bits/locale_classes.h: Same.
* include/bits/basic_string.h: Same.
* include/bits/ios_base.h: Same.
* include/tr1/memory: Same.
* src/pool_allocator.cc: Same.
* src/mt_allocator.cc: Same.
* src/locale_init.cc: Same.
* src/ios.cc: Same.
* src/locale.cc: Same.
* src/bitmap_allocator.cc: Same.
* src/ios_init.cc: Same.
* src/debug.cc: Same.
From-SVN: r116942
Diffstat (limited to 'libstdc++-v3/src/debug.cc')
| -rw-r--r-- | libstdc++-v3/src/debug.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc index 9484556..c43acd6 100644 --- a/libstdc++-v3/src/debug.cc +++ b/libstdc++-v3/src/debug.cc @@ -35,14 +35,14 @@ #include <cassert> #include <cstring> #include <cctype> -#include <bits/concurrence.h> +#include <ext/concurrence.h> using namespace std; namespace { - static __glibcxx_mutex_define_initialized(iterator_base_mutex); -} + __gnu_cxx::__mutex iterator_base_mutex; +} // anonymous namespace namespace __gnu_debug { @@ -192,7 +192,7 @@ namespace __gnu_debug // Attach to the new sequence (if there is one) if (__seq) { - __gnu_cxx::lock sentry(iterator_base_mutex); + __gnu_cxx::__scoped_lock sentry(iterator_base_mutex); _M_sequence = __seq; _M_version = _M_sequence->_M_version; _M_prior = 0; @@ -217,7 +217,7 @@ namespace __gnu_debug _Safe_iterator_base:: _M_detach() { - __gnu_cxx::lock sentry(iterator_base_mutex); + __gnu_cxx::__scoped_lock sentry(iterator_base_mutex); if (_M_sequence) { // Remove us from this sequence's list |