Fixed explicit qualification in sourcehook.cpp, updated Makefile for new shworker ( =P ), generated new sourcehook.h
authorPavol Marko <pavolmarko@gmail.com>
Wed Aug 09 07:42:16 2006 +0000 (2006-08-09)
changeset 235df7d7d108475
parent 234 f7526d407359
child 236 a45576fe84cd
Fixed explicit qualification in sourcehook.cpp, updated Makefile for new shworker ( =P ), generated new sourcehook.h
sourcehook/generate/sourcehook.h
sourcehook/sourcehook.cpp
sourcehook/sourcehook.h
sourcehook/test/Makefile
     1.1 --- a/sourcehook/generate/sourcehook.h	Wed Aug 09 07:25:48 2006 +0000
     1.2 +++ b/sourcehook/generate/sourcehook.h	Wed Aug 09 07:42:16 2006 +0000
     1.3 @@ -501,12 +501,12 @@
     1.4  	{
     1.5  		inline static T* GetOrigRet(ISourceHook *shptr)
     1.6  		{
     1.7 -			T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
     1.8 +			T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
     1.9  			return &ref;
    1.10  		}
    1.11  		inline static T* GetOverrideRet(ISourceHook *shptr)
    1.12  		{
    1.13 -			T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
    1.14 +			T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
    1.15  			return &ref;
    1.16  		}
    1.17  	};
    1.18 @@ -5842,7 +5842,7 @@
    1.19  		void operator()(ISourceHook *shptr, T &res)
    1.20  		{
    1.21  			// overrideretptr points to ReferenceCarrier<T&>
    1.22 -			*reinterpret_cast<ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
    1.23 +			*reinterpret_cast<typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
    1.24  		}
    1.25  	};
    1.26  
     2.1 --- a/sourcehook/sourcehook.cpp	Wed Aug 09 07:25:48 2006 +0000
     2.2 +++ b/sourcehook/sourcehook.cpp	Wed Aug 09 07:42:16 2006 +0000
     2.3 @@ -24,12 +24,12 @@
     2.4  namespace SourceHook
     2.5  {
     2.6  	template<>
     2.7 -	int SourceHook::HashFunction<int>(const int & k)
     2.8 +	int HashFunction<int>(const int & k)
     2.9  	{
    2.10  		return k;
    2.11  	}
    2.12  	template<>
    2.13 -	int SourceHook::Compare<int>(const int & k1, const int & k2)
    2.14 +	int Compare<int>(const int & k1, const int & k2)
    2.15  	{
    2.16  		if (k1 == k2)
    2.17  			return 0;
     3.1 --- a/sourcehook/sourcehook.h	Wed Aug 09 07:25:48 2006 +0000
     3.2 +++ b/sourcehook/sourcehook.h	Wed Aug 09 07:42:16 2006 +0000
     3.3 @@ -501,12 +501,12 @@
     3.4  	{
     3.5  		inline static T* GetOrigRet(ISourceHook *shptr)
     3.6  		{
     3.7 -			T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
     3.8 +			T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
     3.9  			return &ref;
    3.10  		}
    3.11  		inline static T* GetOverrideRet(ISourceHook *shptr)
    3.12  		{
    3.13 -			T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
    3.14 +			T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
    3.15  			return &ref;
    3.16  		}
    3.17  	};
    3.18 @@ -5842,7 +5842,7 @@
    3.19  		void operator()(ISourceHook *shptr, T &res)
    3.20  		{
    3.21  			// overrideretptr points to ReferenceCarrier<T&>
    3.22 -			*reinterpret_cast<ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
    3.23 +			*reinterpret_cast<typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
    3.24  		}
    3.25  	};
    3.26  
     4.1 --- a/sourcehook/test/Makefile	Wed Aug 09 07:25:48 2006 +0000
     4.2 +++ b/sourcehook/test/Makefile	Wed Aug 09 07:42:16 2006 +0000
     4.3 @@ -33,13 +33,13 @@
     4.4  	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
     4.5  
     4.6  ../sourcehook.h: ../generate/sourcehook.hxx
     4.7 -	(cd ../generate; ./shworker.bin iter $(MAX_PARAMS) sourcehook.hxx sourcehook.h; cp sourcehook.h ..)
     4.8 +	(cd ../generate; ./shworker.bin iter sourcehook.hxx sourcehook.h $(MAX_PARAMS); cp sourcehook.h ..)
     4.9  
    4.10  ../sourcehook.hxx: ../generate/sh_memfuncinfo.hxx
    4.11 -	(cd ../generate; ./shworker.bin iter $(MAX_PARAMS) sh_memfuncinfo.hxx sh_memfuncinfo.h; cp sh_memfuncino.h ..)
    4.12 +	(cd ../generate; ./shworker.bin iter sh_memfuncinfo.hxx sh_memfuncinfo.h $(MAX_PARAMS); cp sh_memfuncino.h ..)
    4.13  
    4.14  ../FastDelegate.hxx: ../generate/FastDelegate.hxx
    4.15 -	(cd ../generate; ./shworker.bin iter $(MAX_PARAMS) FastDelegate.hxx FastDelegate.h; cp FastDelegate.h ..)
    4.16 +	(cd ../generate; ./shworker.bin iter FastDelegate.hxx FastDelegate.h $(MAX_PARAMS); cp FastDelegate.h ..)
    4.17  	
    4.18  debug:
    4.19  	$(MAKE) all DEBUG=true