mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
porting bugs to Irix
This commit is contained in:
parent
160ecdf91c
commit
ccb4fd40df
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user