diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
-rw-r--r-- | libstdc++-v3/src/debug.cc | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0b05453..dbbbea9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,12 @@ 2004-11-02 Benjamin Kosnik <bkoz@redhat.com> + Lothar Werzinger <lothar@xcerla.com> + + PR libstdc++/17627 + * src/debug.cc: Include concurrence, use mutexes. + (_Safe_iterator_base::_M_attach): Here. + (_Safe_iterator_base::_M_detach): Here. + +2004-11-02 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/17922 * include/bits/ios_base.h : Add enum values. diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc index 0ca9238..fe6bba4 100644 --- a/libstdc++-v3/src/debug.cc +++ b/libstdc++-v3/src/debug.cc @@ -37,9 +37,17 @@ #include <cstring> #include <cstdio> #include <cctype> +#include <bits/concurrence.h> using namespace std; +namespace __gnu_internal +{ + __glibcxx_mutex_define_initialized(iterator_base_attach_mutex); + __glibcxx_mutex_define_initialized(iterator_base_detach_mutex); + +} // namespace __gnu_internal + namespace __gnu_debug { const char* _S_debug_messages[] = @@ -188,6 +196,7 @@ namespace __gnu_debug // Attach to the new sequence (if there is one) if (__seq) { + __gnu_cxx::lock sentry(__gnu_internal::iterator_base_attach_mutex); _M_sequence = __seq; _M_version = _M_sequence->_M_version; _M_prior = 0; @@ -212,6 +221,7 @@ namespace __gnu_debug _Safe_iterator_base:: _M_detach() { + __gnu_cxx::lock sentry(__gnu_internal::iterator_base_detach_mutex); if (_M_sequence) { // Remove us from this sequence's list |