From b8f3e146eed851778d5ffd82a005ce763c49e16f Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 12 Apr 2002 21:03:18 +0000
Subject: [PATCH] pallocator -> dallocator

---
 dtool/src/dtoolbase/dallocator.T | 11 +++--------
 dtool/src/dtoolbase/dallocator.h | 11 +++++++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dtool/src/dtoolbase/dallocator.T b/dtool/src/dtoolbase/dallocator.T
index 789100020e..32b3a95031 100644
--- a/dtool/src/dtoolbase/dallocator.T
+++ b/dtool/src/dtoolbase/dallocator.T
@@ -59,25 +59,20 @@ deallocate(void *p, size_t) {
 
 template<class Type>
 INLINE dallocator<Type>::
-dallocator() {
-}
-
-template<class Type>
-INLINE dallocator<Type>::
-dallocator(const allocator<Type> &copy) {
+dallocator() throw() {
 }
 
 template<class Type>
 INLINE dallocator<Type>::pointer dallocator<Type>::
 allocate(dallocator<Type>::size_type n, allocator<void>::const_pointer) {
-  return (dallocator<Type>::pointer)default_operator_new(n * sizeof(Type));
+  return (dallocator<Type>::pointer)(*global_operator_new)(n * sizeof(Type));
 }
 
 template<class Type>
 INLINE void dallocator<Type>::
 //deallocate(dallocator<Type>::pointer p, allocator<Type>::size_type) {
 deallocate(void *p, allocator<Type>::size_type) {
-  default_operator_delete(p);
+  (*global_operator_delete)(p);
 }
 
 #endif  // *_STYLE_ALLOCATOR
diff --git a/dtool/src/dtoolbase/dallocator.h b/dtool/src/dtoolbase/dallocator.h
index 2d40452843..b7f9149ef0 100644
--- a/dtool/src/dtoolbase/dallocator.h
+++ b/dtool/src/dtoolbase/dallocator.h
@@ -78,10 +78,17 @@ public:
 template<class Type>
 class dallocator : public allocator<Type> {
 public:
-  INLINE dallocator();
-  INLINE dallocator(const allocator<Type> &copy);
+  INLINE dallocator() throw();
+
+  // template member functions in VC++ can only be defined in-class.
+  template<class U>
+  INLINE dallocator(const dallocator<U> &copy) throw() { }
+
   INLINE pointer allocate(size_type n, allocator<void>::const_pointer hint = 0);
   INLINE void deallocate(void *p, size_type n);
+
+  template<class U>
+  struct rebind { typedef dallocator<U> other; };
 };
 
 #else