2005-05-24 Benjamin Kosnik <bkoz@redhat.com>

	* include/bits/allocator.h: Change ___glibcxx_base_allocator to
	__glibcxx_base_allocator.
	* config/allocator/bitmap_allocator_base.h: Same.
	* config/allocator/malloc_allocator_base.h: Same.
	* config/allocator/mt_allocator_base.h: Same.
	* config/allocator/new_allocator_base.h: Same.
	* config/allocator/pool_allocator_base.h: Same.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100111 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 24 insertions, 14 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e39d577d540..abf35d8bdcc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-24  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/allocator.h: Change ___glibcxx_base_allocator to
+	__glibcxx_base_allocator.
+	* config/allocator/bitmap_allocator_base.h: Same.
+	* config/allocator/malloc_allocator_base.h: Same.
+	* config/allocator/mt_allocator_base.h: Same.
+	* config/allocator/new_allocator_base.h: Same.
+	* config/allocator/pool_allocator_base.h: Same.
+
 2005-05-24  Jonathan Wakely  <redi@gcc.gnu.org>
 
 	* include/debug/string (class basic_string): Add missing
diff --git a/libstdc++-v3/config/allocator/bitmap_allocator_base.h b/libstdc++-v3/config/allocator/bitmap_allocator_base.h
index bf84ae06d7f..2a674cff04c 100644
--- a/libstdc++-v3/config/allocator/bitmap_allocator_base.h
+++ b/libstdc++-v3/config/allocator/bitmap_allocator_base.h
@@ -1,6 +1,6 @@
 // Base to std::allocator -*- C++ -*-
 
-// 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
@@ -32,6 +32,6 @@
 
 // Define bitmap_allocator as the base class to std::allocator.
 #include <ext/bitmap_allocator.h>
-#define ___glibcxx_base_allocator  __gnu_cxx::bitmap_allocator
+#define __glibcxx_base_allocator  __gnu_cxx::bitmap_allocator
 
 #endif
diff --git a/libstdc++-v3/config/allocator/malloc_allocator_base.h b/libstdc++-v3/config/allocator/malloc_allocator_base.h
index 4a82ec362c5..bc5e6b79042 100644
--- a/libstdc++-v3/config/allocator/malloc_allocator_base.h
+++ b/libstdc++-v3/config/allocator/malloc_allocator_base.h
@@ -1,6 +1,6 @@
 // Base to std::allocator -*- C++ -*-
 
-// 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
@@ -32,6 +32,6 @@
 
 // Define new_allocator as the base class to std::allocator.
 #include <ext/malloc_allocator.h>
-#define ___glibcxx_base_allocator  __gnu_cxx::malloc_allocator
+#define __glibcxx_base_allocator  __gnu_cxx::malloc_allocator
 
 #endif
diff --git a/libstdc++-v3/config/allocator/mt_allocator_base.h b/libstdc++-v3/config/allocator/mt_allocator_base.h
index 52b4421a439..df39e2a2584 100644
--- a/libstdc++-v3/config/allocator/mt_allocator_base.h
+++ b/libstdc++-v3/config/allocator/mt_allocator_base.h
@@ -1,6 +1,6 @@
 // Base to std::allocator -*- C++ -*-
 
-// 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
@@ -32,6 +32,6 @@
 
 // Define mt_allocator as the base class to std::allocator.
 #include <ext/mt_allocator.h>
-#define ___glibcxx_base_allocator  __gnu_cxx::__mt_alloc
+#define __glibcxx_base_allocator  __gnu_cxx::__mt_alloc
 
 #endif
diff --git a/libstdc++-v3/config/allocator/new_allocator_base.h b/libstdc++-v3/config/allocator/new_allocator_base.h
index 442f89cc535..c9b3bb20673 100644
--- a/libstdc++-v3/config/allocator/new_allocator_base.h
+++ b/libstdc++-v3/config/allocator/new_allocator_base.h
@@ -1,6 +1,6 @@
 // Base to std::allocator -*- C++ -*-
 
-// 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
@@ -32,6 +32,6 @@
 
 // Define new_allocator as the base class to std::allocator.
 #include <ext/new_allocator.h>
-#define ___glibcxx_base_allocator  __gnu_cxx::new_allocator
+#define __glibcxx_base_allocator  __gnu_cxx::new_allocator
 
 #endif
diff --git a/libstdc++-v3/config/allocator/pool_allocator_base.h b/libstdc++-v3/config/allocator/pool_allocator_base.h
index 77c74b2d512..27432e86e32 100644
--- a/libstdc++-v3/config/allocator/pool_allocator_base.h
+++ b/libstdc++-v3/config/allocator/pool_allocator_base.h
@@ -1,6 +1,6 @@
 // Base to std::allocator -*- C++ -*-
 
-// 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
@@ -32,6 +32,6 @@
 
 // Define new_allocator as the base class to std::allocator.
 #include <ext/pool_allocator.h>
-#define ___glibcxx_base_allocator  __gnu_cxx::__pool_alloc
+#define __glibcxx_base_allocator  __gnu_cxx::__pool_alloc
 
 #endif
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index c28442fc6fa..598048d0df3 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -1,6 +1,6 @@
 // Allocators -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 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
@@ -79,7 +79,7 @@ namespace std
    *  http://gcc.gnu.org/onlinedocs/libstdc++/20_util/allocator.html
    */
   template<typename _Tp>
-    class allocator: public ___glibcxx_base_allocator<_Tp>
+    class allocator: public __glibcxx_base_allocator<_Tp>
     {
    public:
       typedef size_t     size_type;
@@ -97,7 +97,7 @@ namespace std
       allocator() throw() { }
 
       allocator(const allocator& __a) throw()
-      : ___glibcxx_base_allocator<_Tp>(__a) { }
+      : __glibcxx_base_allocator<_Tp>(__a) { }
 
       template<typename _Tp1>
         allocator(const allocator<_Tp1>&) throw() { }
@@ -126,7 +126,7 @@ namespace std
 #endif
 
   // Undefine.
-#undef ___glibcxx_base_allocator
+#undef __glibcxx_base_allocator
 } // namespace std
 
 #endif