TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix warning on win32

Browse Source
This commit is contained in:
David Rose 2004-09-30 22:22:32 +00:00
parent a5c6cbfb0d
commit 0392b84e23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/express/weakPointerToBase.I
View File

@ -113,7 +113,7 @@ reassign(const PointerToBase<To> &copy) {
// This double-casting is a bit of a cheat to get around the
// inheritance issue--it's difficult to declare a template class to
// be a friend.
reassign((To *)((const WeakPointerToBase<To> &)copy)._void_ptr);
reassign((To *)((const WeakPointerToBase<To> *)&copy)->_void_ptr);
}
////////////////////////////////////////////////////////////////////
@ -302,7 +302,7 @@ operator >= (const WeakPointerToBase<To> &other) const {
template<class T>
INLINE bool WeakPointerToBase<T>::
operator == (const PointerToBase<To> &other) const {
return (To *)_void_ptr == (To *)((WeakPointerToBase<To> &)other)._void_ptr;
return (To *)_void_ptr == (To *)((WeakPointerToBase<To> *)&other)->_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -313,7 +313,7 @@ operator == (const PointerToBase<To> &other) const {
template<class T>
INLINE bool WeakPointerToBase<T>::
operator != (const PointerToBase<To> &other) const {
return (To *)_void_ptr != (To *)((WeakPointerToBase<To> &)other)._void_ptr;
return (To *)_void_ptr != (To *)((WeakPointerToBase<To> *)&other)->_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -324,7 +324,7 @@ operator != (const PointerToBase<To> &other) const {
template<class T>
INLINE bool WeakPointerToBase<T>::
operator > (const PointerToBase<To> &other) const {
return (To *)_void_ptr > (To *)((WeakPointerToBase<To> &)other)._void_ptr;
return (To *)_void_ptr > (To *)((WeakPointerToBase<To> *)&other)->_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -335,7 +335,7 @@ operator > (const PointerToBase<To> &other) const {
template<class T>
INLINE bool WeakPointerToBase<T>::
operator <= (const PointerToBase<To> &other) const {
return (To *)_void_ptr <= (To *)((WeakPointerToBase<To> &)other)._void_ptr;
return (To *)_void_ptr <= (To *)((WeakPointerToBase<To> *)&other)->_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -346,7 +346,7 @@ operator <= (const PointerToBase<To> &other) const {
template<class T>
INLINE bool WeakPointerToBase<T>::
operator >= (const PointerToBase<To> &other) const {
return (To *)_void_ptr >= (To *)((WeakPointerToBase<To> &)other)._void_ptr;
return (To *)_void_ptr >= (To *)((WeakPointerToBase<To> *)&other)->_void_ptr;
}
#endif // WIN32_VC
@ -380,7 +380,7 @@ operator < (const WeakPointerToBase<To> &other) const {
template<class T>
INLINE bool WeakPointerToBase<T>::
operator < (const PointerToBase<To> &other) const {
return (To *)_void_ptr < (To *)((WeakPointerToBase<To> &)other)._void_ptr;
return (To *)_void_ptr < (To *)((WeakPointerToBase<To> *)&other)->_void_ptr;
}
#endif // CPPPARSER