TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

vc7.1 fixes

Browse Source
This commit is contained in:
cxgeorge 2002-11-22 03:58:55 +00:00
parent d99b1ff360
commit bda142a078
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/pptempl/compilerSettings.pp
View File

@ -44,7 +44,7 @@
// ensure pdbs are copied to install dir // ensure pdbs are copied to install dir
#define build_pdbs yes #define build_pdbs yes
#elif $[eq $[USE_COMPILER], MSVC7] #elif $[or $[eq $[USE_COMPILER], MSVC7], $[eq $[USE_COMPILER], MSVC7_1]]
#define COMPILER cl #define COMPILER cl
#define LINKER link #define LINKER link

7
dtool/src/dtoolbase/dtoolbase.h
View File

@ -49,8 +49,13 @@
#pragma warning (disable : 4244) #pragma warning (disable : 4244)
#if _MSC_VER >= 1300 #if _MSC_VER >= 1300
#if _MSC_VER >= 1310
#define USING_MSVC7_1
//#pragma message("VC 7.1")
#else
//#pragma message("VC 7.0")
#endif
#define USING_MSVC7 #define USING_MSVC7
//#pragma message("VC 7.0")
#else #else
// #pragma message("VC 6.0") // #pragma message("VC 6.0")
#endif #endif

8
dtool/src/dtoolbase/pallocator.T
View File

@ -72,15 +72,17 @@ 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() {
} }
template<class Type> template<class Type>
INLINE pallocator<Type>::pointer pallocator<Type>:: INLINE typename pallocator<Type>::pointer pallocator<Type>::
allocate(pallocator<Type>::size_type n, allocator<void>::const_pointer) { allocate(typename pallocator<Type>::size_type n, typename allocator<void>::const_pointer) {
return (pallocator<Type>::pointer)(*global_operator_new)(n * sizeof(Type)); return (typename pallocator<Type>::pointer)(*global_operator_new)(n * sizeof(Type));
} }
template<class Type> template<class Type>