Browse Source

remove bogus OLD_STYLE_ALLOCATOR line

cxgeorge 24 years ago
parent
commit
e7caa4f890
2 changed files with 7 additions and 1 deletions
  1. 1 1
      dtool/Config.Win32.pp
  2. 6 0
      dtool/src/dtoolbase/dallocator.h

+ 1 - 1
dtool/Config.Win32.pp

@@ -101,7 +101,7 @@
 #define GLOBAL_OPERATOR_NEW_EXCEPTIONS
 #define GLOBAL_OPERATOR_NEW_EXCEPTIONS
 
 
 // Do we expect the old STL allocator?
 // Do we expect the old STL allocator?
-#define OLD_STYLE_ALLOCATOR
+#undef OLD_STYLE_ALLOCATOR
 
 
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 #define NOT_INTEL_BUILDABLE false
 #define NOT_INTEL_BUILDABLE false

+ 6 - 0
dtool/src/dtoolbase/dallocator.h

@@ -41,6 +41,8 @@
 // somewhat different from the STL standard.  Irix uses this one too.
 // somewhat different from the STL standard.  Irix uses this one too.
 // It might be inherited from an early draft of the STL standard.
 // It might be inherited from an early draft of the STL standard.
 
 
+#pragma message("xxxxxxxxx using old style allocator")
+
 template<class Type>
 template<class Type>
 class dallocator : public alloc {
 class dallocator : public alloc {
 public:
 public:
@@ -54,6 +56,8 @@ public:
 // Later versions of gcc want to use a still different, nonstandard
 // Later versions of gcc want to use a still different, nonstandard
 // definition.  Sheesh.
 // definition.  Sheesh.
 
 
+#pragma message("xxxxxxxxx using gnu style allocator")
+
 template<class Type>
 template<class Type>
 class dallocator : public allocator<Type> {
 class dallocator : public allocator<Type> {
 public:
 public:
@@ -73,6 +77,8 @@ public:
 
 
 #else  // *_STYLE_ALLOCATOR
 #else  // *_STYLE_ALLOCATOR
 
 
+#pragma message("xxxxxxxxx using default allocator")
+
 // This is the correct allocator declaration as the current C++
 // This is the correct allocator declaration as the current C++
 // standard defines it.
 // standard defines it.
 template<class Type>
 template<class Type>