mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
vc7.1 fixes
This commit is contained in:
parent
c3ad80cf52
commit
10d2821730
@ -63,9 +63,9 @@ dallocator() throw() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
INLINE dallocator<Type>::pointer dallocator<Type>::
|
INLINE typename dallocator<Type>::pointer dallocator<Type>::
|
||||||
allocate(dallocator<Type>::size_type n, allocator<void>::const_pointer) {
|
allocate(typename dallocator<Type>::size_type n, allocator<void>::const_pointer) {
|
||||||
return (dallocator<Type>::pointer)(*global_operator_new)(n * sizeof(Type));
|
return (typename dallocator<Type>::pointer)(*global_operator_new)(n * sizeof(Type));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
|
@ -72,8 +72,6 @@ deallocate(void *p, allocator<Type>::size_type) {
|
|||||||
|
|
||||||
#elif MODERN_STYLE_ALLOCATOR
|
#elif MODERN_STYLE_ALLOCATOR
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
INLINE pallocator<Type>::
|
INLINE pallocator<Type>::
|
||||||
pallocator() throw() {
|
pallocator() throw() {
|
||||||
|
@ -96,8 +96,9 @@ public:
|
|||||||
INLINE pointer allocate(size_type n, allocator<void>::const_pointer hint = 0);
|
INLINE pointer allocate(size_type n, allocator<void>::const_pointer hint = 0);
|
||||||
INLINE void deallocate(void *p, size_type n);
|
INLINE void deallocate(void *p, size_type n);
|
||||||
|
|
||||||
template<class U>
|
template<class U> struct rebind {
|
||||||
struct rebind { typedef pallocator<U> other; };
|
typedef pallocator<U> other;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user