From 4b5d087246d6aa1b9519970db382fe40e349ac38 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 14 Sep 2011 14:00:46 +0000 Subject: [PATCH] use more explicit casting chain, to maybe help out the Intel compiler --- panda/src/express/weakPointerTo.I | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/panda/src/express/weakPointerTo.I b/panda/src/express/weakPointerTo.I index 9bee3bb509..d42111bbca 100644 --- a/panda/src/express/weakPointerTo.I +++ b/panda/src/express/weakPointerTo.I @@ -31,7 +31,7 @@ WeakPointerTo(To *ptr) : WeakPointerToBase(ptr) { template INLINE WeakPointerTo:: WeakPointerTo(const PointerTo ©) : - WeakPointerToBase((const PointerToBase &)copy) + WeakPointerToBase(*(const PointerToBase *)©) { } @@ -43,7 +43,7 @@ WeakPointerTo(const PointerTo ©) : template INLINE WeakPointerTo:: WeakPointerTo(const WeakPointerTo ©) : - WeakPointerToBase((const PointerToBase &)copy) + WeakPointerToBase(*(const PointerToBase *)©) { } @@ -134,7 +134,7 @@ operator = (To *ptr) { template INLINE WeakPointerTo &WeakPointerTo:: operator = (const PointerTo ©) { - ((WeakPointerTo *)this)->reassign((const PointerToBase &)copy); + ((WeakPointerTo *)this)->reassign(*(const PointerToBase *)©); return *this; } @@ -146,7 +146,7 @@ operator = (const PointerTo ©) { template INLINE WeakPointerTo &WeakPointerTo:: operator = (const WeakPointerTo ©) { - ((WeakPointerTo *)this)->reassign((const PointerToBase &)copy); + ((WeakPointerTo *)this)->reassign(*(const PointerToBase *)©); return *this; } @@ -170,7 +170,7 @@ WeakConstPointerTo(const To *ptr) : template INLINE WeakConstPointerTo:: WeakConstPointerTo(const PointerTo ©) : - WeakPointerToBase((const PointerToBase &)copy) + WeakPointerToBase(*(const PointerToBase *)©) { } @@ -182,7 +182,7 @@ WeakConstPointerTo(const PointerTo ©) : template INLINE WeakConstPointerTo:: WeakConstPointerTo(const ConstPointerTo ©) : - WeakPointerToBase((const PointerToBase &)copy) + WeakPointerToBase(*(const PointerToBase *)©) { } @@ -194,7 +194,7 @@ WeakConstPointerTo(const ConstPointerTo ©) : template INLINE WeakConstPointerTo:: WeakConstPointerTo(const WeakPointerTo ©) : - WeakPointerToBase((const PointerToBase &)copy) + WeakPointerToBase(*(const PointerToBase *)©) { } @@ -206,7 +206,7 @@ WeakConstPointerTo(const WeakPointerTo ©) : template INLINE WeakConstPointerTo:: WeakConstPointerTo(const WeakConstPointerTo ©) : - WeakPointerToBase((const PointerToBase &)copy) + WeakPointerToBase(*(const PointerToBase *)©) { } @@ -298,7 +298,7 @@ operator = (const To *ptr) { template INLINE WeakConstPointerTo &WeakConstPointerTo:: operator = (const PointerTo ©) { - ((WeakConstPointerTo *)this)->reassign((const PointerToBase &)copy); + ((WeakConstPointerTo *)this)->reassign(*(const PointerToBase *)©); return *this; } @@ -310,7 +310,7 @@ operator = (const PointerTo ©) { template INLINE WeakConstPointerTo &WeakConstPointerTo:: operator = (const ConstPointerTo ©) { - ((WeakConstPointerTo *)this)->reassign((const PointerToBase &)copy); + ((WeakConstPointerTo *)this)->reassign(*(const PointerToBase *)©); return *this; } @@ -322,7 +322,7 @@ operator = (const ConstPointerTo ©) { template INLINE WeakConstPointerTo &WeakConstPointerTo:: operator = (const WeakPointerTo ©) { - ((WeakConstPointerTo *)this)->reassign((const PointerToBase &)copy); + ((WeakConstPointerTo *)this)->reassign(*(const PointerToBase *)©); return *this; } @@ -334,6 +334,6 @@ operator = (const WeakPointerTo ©) { template INLINE WeakConstPointerTo &WeakConstPointerTo:: operator = (const WeakConstPointerTo ©) { - ((WeakConstPointerTo *)this)->reassign((const PointerToBase &)copy); + ((WeakConstPointerTo *)this)->reassign(*(const PointerToBase *)©); return *this; }