aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2004-03-12 23:52:08 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2004-03-12 23:52:08 +0000
commiteef56029edf5b3df3a91acfb3dc591107f95c041 (patch)
tree28d804252c307aafd0c47ba5f067efbb7f2621bd
parentd4cd08dda5f66955b84700ce89bbe2a5e29426f2 (diff)
downloadgcc-eef56029edf5b3df3a91acfb3dc591107f95c041.zip
gcc-eef56029edf5b3df3a91acfb3dc591107f95c041.tar.gz
gcc-eef56029edf5b3df3a91acfb3dc591107f95c041.tar.bz2
allocator.h: Revert.
2004-03-12 Benjamin Kosnik <bkoz@redhat.com> * include/bits/allocator.h: Revert. From-SVN: r79413
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/allocator.h8
2 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5e93b5e..816846c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-12 Benjamin Kosnik <bkoz@redhat.com>
+
+ * include/bits/allocator.h: Revert.
+
2004-03-12 Paolo Carlini <pcarlini@suse.de>
* docs/html/ext/howto.html: Add entry for DR 253 [Ready].
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index a831232..eca50c8 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -50,11 +50,11 @@
// Define the base class to std::allocator.
-//#include <ext/new_allocator.h>
-//#define __glibcxx_default_allocator __gnu_cxx::new_allocator
+#include <ext/new_allocator.h>
+#define __glibcxx_default_allocator __gnu_cxx::new_allocator
-#include <ext/mt_allocator.h>
-#define __glibcxx_default_allocator __gnu_cxx::__mt_alloc
+//#include <ext/mt_allocator.h>
+//#define __glibcxx_default_allocator __gnu_cxx::__mt_alloc
namespace std
{