sourcehook/sourcehook.h
changeset 332 030b917a8dcc
parent 330 d801744b795c
child 333 3813f1ac0cfe
     1.1 --- a/sourcehook/sourcehook.h	Sat May 12 09:03:57 2007 +0000
     1.2 +++ b/sourcehook/sourcehook.h	Sat May 12 19:05:16 2007 +0000
     1.3 @@ -298,15 +298,12 @@
     1.4  		}
     1.5  	};
     1.6  
     1.7 -	template<class B> struct CallClass
     1.8 +	template<class B> struct DeprecatedCallClass
     1.9  	{
    1.10  		virtual B *GetThisPtr() = 0;
    1.11  		virtual void *GetOrigFunc(int vtbloffs, int vtblidx) = 0;
    1.12  	};
    1.13  
    1.14 -	typedef CallClass<void> GenericCallClass;
    1.15 -	typedef CallClass<EmptyClass> ManualCallClass;
    1.16 -
    1.17  	// 09.08.2008 (6 AM, I just woke up, the others are still sleeping so i finally can use this notebook !!)
    1.18  	// - Today is an important day.
    1.19  	// I'm adding support for functions which return references.
    1.20 @@ -408,14 +405,14 @@
    1.21  		*	@param iface The interface pointer
    1.22  		*	@param size Size of the class instance
    1.23  		*/
    1.24 -		virtual GenericCallClass *GetCallClass(void *iface, size_t size) = 0;
    1.25 +		virtual DeprecatedCallClass<void> *GetCallClass(void *iface, size_t size) = 0;
    1.26  
    1.27  		/**
    1.28  		*	@brief Release a callclass
    1.29  		*
    1.30  		*	@param ptr Pointer to the callclass
    1.31  		*/
    1.32 -		virtual void ReleaseCallClass(GenericCallClass *ptr) = 0;
    1.33 +		virtual void ReleaseCallClass(DeprecatedCallClass<void> *ptr) = 0;
    1.34  
    1.35  		virtual void SetRes(META_RES res) = 0;				//!< Sets the meta result
    1.36  		virtual META_RES GetPrevRes() = 0;					//!< Gets the meta result of the
    1.37 @@ -569,11 +566,11 @@
    1.38  	};
    1.39  
    1.40  	// For source-level compatibility
    1.41 -	template <class T> struct LegacyCallClass
    1.42 +	template <class T> struct CallClass
    1.43  	{
    1.44  		T *ptr;
    1.45  
    1.46 -		LegacyCallClass(T *p) : ptr(p)
    1.47 +		CallClass(T *p) : ptr(p)
    1.48  		{
    1.49  		}
    1.50  
    1.51 @@ -583,17 +580,21 @@
    1.52  		}
    1.53  	};
    1.54  
    1.55 +	typedef CallClass<void> GenericCallClass;
    1.56 +	typedef CallClass<EmptyClass> ManualCallClass;
    1.57 +
    1.58  	template <class T>
    1.59 -	LegacyCallClass<T> *GetLegacyCallClass(T *p)
    1.60 +	CallClass<T> *GetCallClass(T *p)
    1.61  	{
    1.62 -		return new LegacyCallClass<T>(p);
    1.63 +		return new CallClass<T>(p);
    1.64  	}
    1.65  
    1.66  	template <class T>
    1.67 -	void ReleaseLegacyCallClass(LegacyCallClass<T> *p)
    1.68 +	void ReleaseCallClass(CallClass<T> *p)
    1.69  	{
    1.70  		delete p;
    1.71  	}
    1.72 +
    1.73  }
    1.74  
    1.75  /************************************************************************/
    1.76 @@ -707,12 +708,10 @@
    1.77  	} while (0)
    1.78  
    1.79  // For source-level compatibility
    1.80 -#define CallClass LegacyCallClass
    1.81 -#define ManualCallClass LegacyCallClass<SourceHook::EmptyClass>
    1.82 -
    1.83 -#define SH_GET_CALLCLASS(ptr) SourceHook::GetLegacyCallClass(ptr)
    1.84 -#define SH_GET_MCALLCLASS(ptr, size) SourceHook::GetLegacyCallClass(reinterpret_cast<SourceHook::EmptyClass*>(ptr))
    1.85 -#define SH_RELEASE_CALLCLASS(ptr) SourceHook::ReleaseLegacyCallClass(ptr)
    1.86 +
    1.87 +#define SH_GET_CALLCLASS(ptr) SourceHook::GetCallClass(ptr)
    1.88 +#define SH_GET_MCALLCLASS(ptr, size) SourceHook::GetCallClass(reinterpret_cast<SourceHook::EmptyClass*>(ptr))
    1.89 +#define SH_RELEASE_CALLCLASS(ptr) SourceHook::ReleaseCallClass(ptr)
    1.90  
    1.91  // New ADD / REMOVE macros.
    1.92  #define SH_STATIC(func) fastdelegate::MakeDelegate(func)
    1.93 @@ -3166,12 +3165,12 @@
    1.94  		}
    1.95  	};
    1.96  
    1.97 -	template <class T> struct CCW< LegacyCallClass<T> >
    1.98 +	template <class T> struct CCW< CallClass<T> >
    1.99  	{
   1.100  		typedef T type;
   1.101  
   1.102  		// Get Real Pointer!
   1.103 -		static inline T *GRP(LegacyCallClass<T> *p)
   1.104 +		static inline T *GRP(CallClass<T> *p)
   1.105  		{
   1.106  			return p->ptr;
   1.107  		}