diff --git a/dtool/src/dtoolbase/dallocator.T b/dtool/src/dtoolbase/dallocator.T index 32b3a95031..cf69f02d34 100644 --- a/dtool/src/dtoolbase/dallocator.T +++ b/dtool/src/dtoolbase/dallocator.T @@ -63,9 +63,9 @@ dallocator() throw() { } template -INLINE dallocator::pointer dallocator:: -allocate(dallocator::size_type n, allocator::const_pointer) { - return (dallocator::pointer)(*global_operator_new)(n * sizeof(Type)); +INLINE typename dallocator::pointer dallocator:: +allocate(typename dallocator::size_type n, allocator::const_pointer) { + return (typename dallocator::pointer)(*global_operator_new)(n * sizeof(Type)); } template diff --git a/dtool/src/dtoolbase/pallocator.T b/dtool/src/dtoolbase/pallocator.T index 7f59d0ab09..69161ce8f2 100644 --- a/dtool/src/dtoolbase/pallocator.T +++ b/dtool/src/dtoolbase/pallocator.T @@ -72,8 +72,6 @@ deallocate(void *p, allocator::size_type) { #elif MODERN_STYLE_ALLOCATOR - - template INLINE pallocator:: pallocator() throw() { diff --git a/dtool/src/dtoolbase/pallocator.h b/dtool/src/dtoolbase/pallocator.h index 1f9cb6d39a..058ff5237c 100644 --- a/dtool/src/dtoolbase/pallocator.h +++ b/dtool/src/dtoolbase/pallocator.h @@ -96,8 +96,9 @@ public: INLINE pointer allocate(size_type n, allocator::const_pointer hint = 0); INLINE void deallocate(void *p, size_type n); - template - struct rebind { typedef pallocator other; }; + template struct rebind { + typedef pallocator other; + }; }; #else