porting bugs to Irix

This commit is contained in:
David Rose 2001-06-06 17:23:52 +00:00
parent 160ecdf91c
commit ccb4fd40df
8 changed files with 22 additions and 17 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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"