From c87f384a40583a9638dbb534df95bd9be18cd32e Mon Sep 17 00:00:00 2001 From: Chris Brunner Date: Fri, 28 May 2010 23:22:43 +0000 Subject: [PATCH] fixes for 32 and 64-bit builds both being able to build --- panda/src/express/weakPointerToBase.I | 2 +- panda/src/express/weakPointerToBase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/express/weakPointerToBase.I b/panda/src/express/weakPointerToBase.I index f0a86e266c..61d454ea89 100644 --- a/panda/src/express/weakPointerToBase.I +++ b/panda/src/express/weakPointerToBase.I @@ -125,7 +125,7 @@ reassign(const WeakPointerToBase ©) { } #ifndef CPPPARSER -#if !defined(WIN32_VC) && !defined(WIN64_VC) +#ifndef WIN32_VC //////////////////////////////////////////////////////////////////// // Function: WeakPointerToBase::Equivalence operator // Access: Public diff --git a/panda/src/express/weakPointerToBase.h b/panda/src/express/weakPointerToBase.h index 52150024ee..ddc01b8347 100644 --- a/panda/src/express/weakPointerToBase.h +++ b/panda/src/express/weakPointerToBase.h @@ -48,7 +48,7 @@ public: // These comparison functions are common to all things PointerTo, so // they're defined up here. #ifndef CPPPARSER -#if !defined(WIN32_VC) || !defined(WIN64_VC) +#ifndef WIN32_VC INLINE bool operator == (const To *other) const; INLINE bool operator != (const To *other) const; INLINE bool operator > (const To *other) const;