From ccb4fd40dfbc0888fa4ad4116627395de5fd0e3f Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 6 Jun 2001 17:23:52 +0000
Subject: [PATCH] porting bugs to Irix

---
 dtool/Config.Irix.pp             | 3 +++
 dtool/Config.Linux.pp            | 4 ++--
 dtool/Config.Win32.pp            | 4 +++-
 dtool/LocalSetup.pp              | 4 ++--
 dtool/src/dtoolbase/dallocator.T | 6 +++---
 dtool/src/dtoolbase/dallocator.h | 6 +++---
 dtool/src/dtoolbase/pallocator.T | 6 +++---
 dtool/src/dtoolbase/pallocator.h | 6 +++---
 8 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/dtool/Config.Irix.pp b/dtool/Config.Irix.pp
index 57c1022582..9b8ddd1ce3 100644
--- a/dtool/Config.Irix.pp
+++ b/dtool/Config.Irix.pp
@@ -96,3 +96,6 @@
 
 // Must global operator new and delete functions throw exceptions?
 #define GLOBAL_OPERATOR_NEW_EXCEPTIONS
+
+// Do we expect the old STL allocator?
+#define OLD_STYLE_ALLOCATOR 1
diff --git a/dtool/Config.Linux.pp b/dtool/Config.Linux.pp
index 7494d7d65e..5ff746151b 100644
--- a/dtool/Config.Linux.pp
+++ b/dtool/Config.Linux.pp
@@ -97,5 +97,5 @@
 // Must global operator new and delete functions throw exceptions?
 #define GLOBAL_OPERATOR_NEW_EXCEPTIONS 1
 
-// Do we expect the old gcc custom STL allocator?
-#define GCC_STYLE_ALLOCATOR 1
+// Do we expect the old STL allocator?
+#define OLD_STYLE_ALLOCATOR 1
diff --git a/dtool/Config.Win32.pp b/dtool/Config.Win32.pp
index d76fa0d1ef..a659b2e830 100644
--- a/dtool/Config.Win32.pp
+++ b/dtool/Config.Win32.pp
@@ -97,6 +97,8 @@
 // Must global operator new and delete functions throw exceptions?
 #define GLOBAL_OPERATOR_NEW_EXCEPTIONS
 
+// Do we expect the old STL allocator?
+#define OLD_STYLE_ALLOCATOR
+
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 #define NOT_INTEL_BUILDABLE false
-
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index 961eb41033..8b344151c8 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -184,8 +184,8 @@ $[cdefine HAVE_RTTI]
 /* Must global operator new and delete functions throw exceptions? */
 $[cdefine GLOBAL_OPERATOR_NEW_EXCEPTIONS]
 
-/* Do we expect the old gcc custom STL allocator? */
-$[cdefine GCC_STYLE_ALLOCATOR]
+/* Do we expect the old style STL allocator? */
+$[cdefine OLD_STYLE_ALLOCATOR]
 
 #end dtool_config.h
 
diff --git a/dtool/src/dtoolbase/dallocator.T b/dtool/src/dtoolbase/dallocator.T
index 11cd4f51b6..7164445a92 100644
--- a/dtool/src/dtoolbase/dallocator.T
+++ b/dtool/src/dtoolbase/dallocator.T
@@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifdef GCC_STYLE_ALLOCATOR
+#ifdef OLD_STYLE_ALLOCATOR
 
 #ifndef NDEBUG
 template<class Type>
@@ -32,7 +32,7 @@ deallocate(void *p, size_t) {
 }
 #endif  // NDEBUG
 
-#else  // GCC_STYLE_ALLOCATOR
+#else  // OLD_STYLE_ALLOCATOR
 
 #ifndef NDEBUG
 template<class Type>
@@ -49,4 +49,4 @@ deallocate(void *p, allocator<Type>::size_type) {
 }
 #endif  // NDEBUG
 
-#endif  // GCC_STYLE_ALLOCATOR
+#endif  // OLD_STYLE_ALLOCATOR
diff --git a/dtool/src/dtoolbase/dallocator.h b/dtool/src/dtoolbase/dallocator.h
index 71fd014a02..8310fd42a5 100644
--- a/dtool/src/dtoolbase/dallocator.h
+++ b/dtool/src/dtoolbase/dallocator.h
@@ -36,7 +36,7 @@
 //               within the MemoryUsage class itself.
 ////////////////////////////////////////////////////////////////////
 
-#ifdef GCC_STYLE_ALLOCATOR
+#ifdef OLD_STYLE_ALLOCATOR
 // Early versions of gcc used its own kind of allocator, somewhat
 // different from the STL standard.
 
@@ -49,7 +49,7 @@ public:
 #endif  // NDEBUG
 };
 
-#else  // GCC_STYLE_ALLOCATOR
+#else  // OLD_STYLE_ALLOCATOR
 
 template<class Type>
 class dallocator : public allocator<Type> {
@@ -60,7 +60,7 @@ public:
   INLINE void deallocate(void *p, size_type n);
 #endif  // NDEBUG
 };
-#endif  // GCC_STYLE_ALLOCATOR
+#endif  // OLD_STYLE_ALLOCATOR
 
 #include "dallocator.T"
 
diff --git a/dtool/src/dtoolbase/pallocator.T b/dtool/src/dtoolbase/pallocator.T
index a1cb56a538..fb38e34686 100644
--- a/dtool/src/dtoolbase/pallocator.T
+++ b/dtool/src/dtoolbase/pallocator.T
@@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifdef GCC_STYLE_ALLOCATOR
+#ifdef OLD_STYLE_ALLOCATOR
 
 #ifndef NDEBUG
 template<class Type>
@@ -32,7 +32,7 @@ deallocate(void *p, size_t) {
 }
 #endif  // NDEBUG
 
-#else  // GCC_STYLE_ALLOCATOR
+#else  // OLD_STYLE_ALLOCATOR
 
 #ifndef NDEBUG
 template<class Type>
@@ -49,4 +49,4 @@ deallocate(void *p, allocator<Type>::size_type) {
 }
 #endif  // NDEBUG
 
-#endif  // GCC_STYLE_ALLOCATOR
+#endif  // OLD_STYLE_ALLOCATOR
diff --git a/dtool/src/dtoolbase/pallocator.h b/dtool/src/dtoolbase/pallocator.h
index 1d4d7677a9..7f0356d7d4 100644
--- a/dtool/src/dtoolbase/pallocator.h
+++ b/dtool/src/dtoolbase/pallocator.h
@@ -34,7 +34,7 @@
 //               to use a pallocator.
 ////////////////////////////////////////////////////////////////////
 
-#ifdef GCC_STYLE_ALLOCATOR
+#ifdef OLD_STYLE_ALLOCATOR
 // Early versions of gcc used its own kind of allocator, somewhat
 // different from the STL standard.
 
@@ -47,7 +47,7 @@ public:
 #endif  // NDEBUG
 };
 
-#else  // GCC_STYLE_ALLOCATOR
+#else  // OLD_STYLE_ALLOCATOR
 
 template<class Type>
 class pallocator : public allocator<Type> {
@@ -58,7 +58,7 @@ public:
   INLINE void deallocate(void *p, size_type n);
 #endif  // NDEBUG
 };
-#endif  // GCC_STYLE_ALLOCATOR
+#endif  // OLD_STYLE_ALLOCATOR
 
 #include "pallocator.T"