diff -r 40467046ea05 -r 030b917a8dcc sourcehook/sourcehook.h --- a/sourcehook/sourcehook.h Sat May 12 09:03:57 2007 +0000 +++ b/sourcehook/sourcehook.h Sat May 12 19:05:16 2007 +0000 @@ -298,15 +298,12 @@ } }; - template struct CallClass + template struct DeprecatedCallClass { virtual B *GetThisPtr() = 0; virtual void *GetOrigFunc(int vtbloffs, int vtblidx) = 0; }; - typedef CallClass GenericCallClass; - typedef CallClass ManualCallClass; - // 09.08.2008 (6 AM, I just woke up, the others are still sleeping so i finally can use this notebook !!) // - Today is an important day. // I'm adding support for functions which return references. @@ -408,14 +405,14 @@ * @param iface The interface pointer * @param size Size of the class instance */ - virtual GenericCallClass *GetCallClass(void *iface, size_t size) = 0; + virtual DeprecatedCallClass *GetCallClass(void *iface, size_t size) = 0; /** * @brief Release a callclass * * @param ptr Pointer to the callclass */ - virtual void ReleaseCallClass(GenericCallClass *ptr) = 0; + virtual void ReleaseCallClass(DeprecatedCallClass *ptr) = 0; virtual void SetRes(META_RES res) = 0; //!< Sets the meta result virtual META_RES GetPrevRes() = 0; //!< Gets the meta result of the @@ -569,11 +566,11 @@ }; // For source-level compatibility - template struct LegacyCallClass + template struct CallClass { T *ptr; - LegacyCallClass(T *p) : ptr(p) + CallClass(T *p) : ptr(p) { } @@ -583,17 +580,21 @@ } }; + typedef CallClass GenericCallClass; + typedef CallClass ManualCallClass; + template - LegacyCallClass *GetLegacyCallClass(T *p) + CallClass *GetCallClass(T *p) { - return new LegacyCallClass(p); + return new CallClass(p); } template - void ReleaseLegacyCallClass(LegacyCallClass *p) + void ReleaseCallClass(CallClass *p) { delete p; } + } /************************************************************************/ @@ -707,12 +708,10 @@ } while (0) // For source-level compatibility -#define CallClass LegacyCallClass -#define ManualCallClass LegacyCallClass - -#define SH_GET_CALLCLASS(ptr) SourceHook::GetLegacyCallClass(ptr) -#define SH_GET_MCALLCLASS(ptr, size) SourceHook::GetLegacyCallClass(reinterpret_cast(ptr)) -#define SH_RELEASE_CALLCLASS(ptr) SourceHook::ReleaseLegacyCallClass(ptr) + +#define SH_GET_CALLCLASS(ptr) SourceHook::GetCallClass(ptr) +#define SH_GET_MCALLCLASS(ptr, size) SourceHook::GetCallClass(reinterpret_cast(ptr)) +#define SH_RELEASE_CALLCLASS(ptr) SourceHook::ReleaseCallClass(ptr) // New ADD / REMOVE macros. #define SH_STATIC(func) fastdelegate::MakeDelegate(func) @@ -3166,12 +3165,12 @@ } }; - template struct CCW< LegacyCallClass > + template struct CCW< CallClass > { typedef T type; // Get Real Pointer! - static inline T *GRP(LegacyCallClass *p) + static inline T *GRP(CallClass *p) { return p->ptr; }