2005-09-25 Benjamin Kosnik <bkoz@redhat.com>

	    Eric Botcazou  <ebotcazou@libertysurf.fr>

	* include/ext/mt_allocator.h
	(__per_type_pool<...true>::_S_initialize_once): Always call
	_M_initialize_once.
	(__common_pool<...true>::_S_initialize_once): Same.

Co-Authored-By: Eric Botcazou <ebotcazou@libertysurf.fr>
From-SVN: r104678

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60af325a121190f424ed13fc36266d519c07972c..59624138ed46efbc3c1416828ad21d619c8b9c4d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-25  Benjamin Kosnik  <bkoz@redhat.com>
+           Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * include/ext/mt_allocator.h
+       (__per_type_pool<...true>::_S_initialize_once): Always call
+       _M_initialize_once.
+       (__common_pool<...true>::_S_initialize_once): Same.
+
 2005-09-23  Benjamin Kosnik  <bkoz@redhat.com>
 
        * testsuite/ext/mt_allocator/tune-1.cc: Clarify for single-thread.

diff --git a/libstdc++-v3/include/ext/mt_allocator.h b/libstdc++-v3/include/ext/mt_allocator.h
index 23dd511374c41d911fbb2802a9f17720fe73a2fd..014e62a57c19072d870a0374eede842bfe7fc6bc 100644 (file)
--- a/libstdc++-v3/include/ext/mt_allocator.h
+++ b/libstdc++-v3/include/ext/mt_allocator.h
@@ -432,8 +432,11 @@ namespace __gnu_cxx
                static __gthread_once_t __once = __GTHREAD_ONCE_INIT;
                __gthread_once(&__once, _S_initialize);
              }
-           else
-             _S_get_pool()._M_initialize_once(); 
+
+           // Double check initialization. May be necessary on some
+           // systems for proper construction when not compiling with
+           // thread flags.
+           _S_get_pool()._M_initialize_once(); 
            __init = true;
          }
       }
@@ -524,8 +527,11 @@ namespace __gnu_cxx
                static __gthread_once_t __once = __GTHREAD_ONCE_INIT;
                __gthread_once(&__once, _S_initialize);
              }
-           else
-             _S_get_pool()._M_initialize_once(); 
+
+           // Double check initialization. May be necessary on some
+           // systems for proper construction when not compiling with
+           // thread flags.
+           _S_get_pool()._M_initialize_once(); 
            __init = true;
          }
       }