From f4c58e7c2b075e590ff021035ca80c96bd50454d Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 6 Jun 2001 01:19:41 +0000
Subject: [PATCH] porting bugs

---
 dtool/src/dtoolbase/pallocator.T |  5 +++--
 dtool/src/dtoolbase/pallocator.h |  3 ++-
 dtool/src/dtoolbase/pmap.h       | 16 ++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dtool/src/dtoolbase/pallocator.T b/dtool/src/dtoolbase/pallocator.T
index 0420d27355..7566ce4b4f 100644
--- a/dtool/src/dtoolbase/pallocator.T
+++ b/dtool/src/dtoolbase/pallocator.T
@@ -43,8 +43,9 @@ allocate(pallocator<Type>::size_type n, allocator<void>::const_pointer) {
 
 template<class Type>
 INLINE void pallocator<Type>::
-deallocate(pallocator<Type>::pointer p, allocator<Type>::size_type) {
-  (*global_operator_delete)(p);
+//deallocate(pallocator<Type>::pointer p, allocator<Type>::size_type) {
+deallocate(void *p, allocator<Type>::size_type) {
+  (*global_operator_delete)((void *)p);
 }
 #endif  // NDEBUG
 
diff --git a/dtool/src/dtoolbase/pallocator.h b/dtool/src/dtoolbase/pallocator.h
index 7cd9af5cf8..4ecb1dd3b5 100644
--- a/dtool/src/dtoolbase/pallocator.h
+++ b/dtool/src/dtoolbase/pallocator.h
@@ -55,7 +55,8 @@ class pallocator : public allocator<Type> {
 public:
 #ifndef NDEBUG
   INLINE pointer allocate(size_type n, allocator<void>::const_pointer hint = 0);
-  INLINE void deallocate(pointer p, size_type n);
+  //  INLINE void deallocate(pointer p, size_type n);
+  INLINE void deallocate(void *p, size_type n);
 #endif  // NDEBUG
 };
 #endif  // GCC_STYLE_ALLOCATOR
diff --git a/dtool/src/dtoolbase/pmap.h b/dtool/src/dtoolbase/pmap.h
index 1e7979e260..89c77b0e5e 100644
--- a/dtool/src/dtoolbase/pmap.h
+++ b/dtool/src/dtoolbase/pmap.h
@@ -32,11 +32,11 @@
 //               memory.
 ////////////////////////////////////////////////////////////////////
 template<class Key, class Value, class Compare = less<Key> >
-class pmap : public map<Key, Value, Compare, pallocator<pair<Key, Value> > > {
+class pmap : public map<Key, Value, Compare, pallocator<Value> > {
 public:
-  pmap() : map<Key, Value, Compare, pallocator<pair<Key, Value> > >() { }
-  pmap(const pmap<Key, Value, Compare> &copy) : map<Key, Value, Compare, pallocator<pair<Key, Value> > >(copy) { }
-  pmap(const Compare &comp) : map<Key, Compare, pallocator<Key> >(comp) { }
+  pmap() : map<Key, Value, Compare, pallocator<Value> >() { }
+  pmap(const pmap<Key, Value, Compare> &copy) : map<Key, Value, Compare, pallocator<Value> >(copy) { }
+  pmap(const Compare &comp) : map<Key, Value, Compare, pallocator<Value> >(comp) { }
 };
 
 ////////////////////////////////////////////////////////////////////
@@ -47,11 +47,11 @@ public:
 //               memory.
 ////////////////////////////////////////////////////////////////////
 template<class Key, class Value, class Compare = less<Key> >
-class pmultimap : public multimap<Key, Value, Compare, pallocator<pair<Key, Value> > > {
+class pmultimap : public multimap<Key, Value, Compare, pallocator<Value> > {
 public:
-  pmultimap() : multimap<Key, Value, Compare, pallocator<pair<Key, Value> > >() { }
-  pmultimap(const pmultimap<Key, Value, Compare> &copy) : multimap<Key, Value, Compare, pallocator<pair<Key, Value> > >(copy) { }
-  pmultimap(const Compare &comp) : multimap<Key, Compare, pallocator<Key> >(comp) { }
+  pmultimap() : multimap<Key, Value, Compare, pallocator<Value> >() { }
+  pmultimap(const pmultimap<Key, Value, Compare> &copy) : multimap<Key, Value, Compare, pallocator<Value> >(copy) { }
+  pmultimap(const Compare &comp) : multimap<Key, Value, Compare, pallocator<Value> >(comp) { }
 };
 
 #endif