From fb633c36e09ca2e31855e225b5a7137758922cac Mon Sep 17 00:00:00 2001 From: bkoz Date: Fri, 9 Sep 2005 10:14:55 +0000 Subject: [PATCH] 2005-09-09 Benjamin Kosnik Jakub Jelinek * src/debug.cc (iterator_base_mutex): Make static for internal linkage. * src/locale_init.cc (locale_mutex): Same. * src/mt_allocator.cc (freelist_mutex): Same. * src/pool_allocator.cc (palloc_init_mutex): Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104090 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/src/debug.cc | 2 +- libstdc++-v3/src/locale_init.cc | 4 ++-- libstdc++-v3/src/mt_allocator.cc | 2 +- libstdc++-v3/src/pool_allocator.cc | 4 ++-- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5e391f2..e6a51c7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2005-09-09 Benjamin Kosnik + Jakub Jelinek + + * src/debug.cc (iterator_base_mutex): Make static for internal + linkage. + * src/locale_init.cc (locale_mutex): Same. + * src/mt_allocator.cc (freelist_mutex): Same. + * src/pool_allocator.cc (palloc_init_mutex): Same. + 2005-09-02 Paolo Carlini * testsuite/tr1/6_containers/unordered/hashtable/23465.cc: diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc index af927e1..6f32fde 100644 --- a/libstdc++-v3/src/debug.cc +++ b/libstdc++-v3/src/debug.cc @@ -41,7 +41,7 @@ using namespace std; namespace __gnu_internal { - __glibcxx_mutex_define_initialized(iterator_base_mutex); + static __glibcxx_mutex_define_initialized(iterator_base_mutex); } // namespace __gnu_internal namespace __gnu_debug diff --git a/libstdc++-v3/src/locale_init.cc b/libstdc++-v3/src/locale_init.cc index a251e25..3580509 100644 --- a/libstdc++-v3/src/locale_init.cc +++ b/libstdc++-v3/src/locale_init.cc @@ -1,4 +1,4 @@ -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -90,7 +90,7 @@ namespace __gnu_internal #endif // Mutex object for locale initialization. - __glibcxx_mutex_define_initialized(locale_mutex); + static __glibcxx_mutex_define_initialized(locale_mutex); } // namespace __gnu_internal namespace std diff --git a/libstdc++-v3/src/mt_allocator.cc b/libstdc++-v3/src/mt_allocator.cc index 722f79f..8716191 100644 --- a/libstdc++-v3/src/mt_allocator.cc +++ b/libstdc++-v3/src/mt_allocator.cc @@ -37,7 +37,7 @@ namespace __gnu_internal { - __glibcxx_mutex_define_initialized(freelist_mutex); + static __glibcxx_mutex_define_initialized(freelist_mutex); #ifdef __GTHREADS __gthread_key_t freelist_key; diff --git a/libstdc++-v3/src/pool_allocator.cc b/libstdc++-v3/src/pool_allocator.cc index 445ff17..90ada30 100644 --- a/libstdc++-v3/src/pool_allocator.cc +++ b/libstdc++-v3/src/pool_allocator.cc @@ -1,6 +1,6 @@ // Allocator details. -// Copyright (C) 2004 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -37,7 +37,7 @@ namespace __gnu_internal { - __glibcxx_mutex_define_initialized(palloc_init_mutex); + static __glibcxx_mutex_define_initialized(palloc_init_mutex); } namespace __gnu_cxx -- 2.7.4