And retweak.

Co-Authored-By: Matt Kraai <kraai@alumni.cmu.edu> From-SVN: r66530

And retweak.
Co-Authored-By: Matt Kraai <kraai@alumni.cmu.edu> From-SVN: r66530
b7c4cd53 · Michael Ritzert · Loren J. Rittle · 8b689196 · b7c4cd53 · b7c4cd53
Commit b7c4cd53 authored May 06, 2003 by Michael Ritzert Committed by Loren J. Rittle May 06, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletions

libstdc++-v3/ChangeLog
+3 -0

libstdc++-v3/include/ext/stl_rope.h
+5 -1

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
 2003-05-06  Michael Ritzert <Ritzert@t-online.de>
+	    Matt Kraai <kraai@alumni.cmu.edu>

 	* include/ext/stl_rope.h (_Rope_RopeRep<>::_M_c_string_lock): Tweak.
+	And retweak.
+
 2003-05-06  Richard Sandiford  <rsandifo@redhat.com>

 	* configure.target (mips*): Use the generic atomicity.h by default.

--- a/libstdc++-v3/include/ext/stl_rope.h
+++ b/libstdc++-v3/include/ext/stl_rope.h
@@ -500,7 +500,11 @@ struct _Rope_RopeRep : public _Rope_rep_base<_CharT,_Alloc>
 #         endif
          _M_tag(__t), _M_is_balanced(__b), _M_depth(__d), _M_c_string(0)
 #ifdef __GTHREAD_MUTEX_INIT
-    { _M_c_string_lock = __GTHREAD_MUTEX_INIT; }
+    {
+	// Do not copy a POSIX/gthr mutex once in use.  However, bits are bits.
+	__gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT;
+	_M_c_string_lock = __tmp;
+    }
 #else
    { __GTHREAD_MUTEX_INIT_FUNCTION (&_M_c_string_lock); }
 #endif