rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-26 19:54:14 +01:00
Code Issues Releases Activity

Fixed explicit qualification in sourcehook.cpp, updated Makefile for new shworker ( =P ), generated new sourcehook.h

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40252
This commit is contained in:
Pavol Marko 2006-08-09 07:42:16 +00:00
parent 00ab84ba4f
commit f7172629fb
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sourcehook/generate/sourcehook.h
View File

@ -501,12 +501,12 @@ namespace SourceHook
{
inline static T* GetOrigRet(ISourceHook *shptr)
{
T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
return &ref;
}
inline static T* GetOverrideRet(ISourceHook *shptr)
{
T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
return &ref;
}
};
@ -5842,7 +5842,7 @@ namespace SourceHook
void operator()(ISourceHook *shptr, T &res)
{
// overrideretptr points to ReferenceCarrier<T&>
*reinterpret_cast<ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
*reinterpret_cast<typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
}
};

4
sourcehook/sourcehook.cpp
View File

@ -24,12 +24,12 @@
namespace SourceHook
{
template<>
int SourceHook::HashFunction<int>(const int & k)
int HashFunction<int>(const int & k)
{
return k;
}
template<>
int SourceHook::Compare<int>(const int & k1, const int & k2)
int Compare<int>(const int & k1, const int & k2)
{
if (k1 == k2)
return 0;

6
sourcehook/sourcehook.h
View File

@ -501,12 +501,12 @@ namespace SourceHook
{
inline static T* GetOrigRet(ISourceHook *shptr)
{
T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOrigRet());
return &ref;
}
inline static T* GetOverrideRet(ISourceHook *shptr)
{
T &ref = *reinterpret_cast<const ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
T &ref = *reinterpret_cast<const typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRet());
return &ref;
}
};
@ -5842,7 +5842,7 @@ namespace SourceHook
void operator()(ISourceHook *shptr, T &res)
{
// overrideretptr points to ReferenceCarrier<T&>
*reinterpret_cast<ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
*reinterpret_cast<typename ReferenceCarrier<T&>::type *>(shptr->GetOverrideRetPtr()) = res;
}
};

6
sourcehook/test/Makefile
View File

@ -33,13 +33,13 @@ $(BIN_DIR)/%.o: %.cpp $(HEADERS)
$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
../sourcehook.h: ../generate/sourcehook.hxx
(cd ../generate; ./shworker.bin iter $(MAX_PARAMS) sourcehook.hxx sourcehook.h; cp sourcehook.h ..)
(cd ../generate; ./shworker.bin iter sourcehook.hxx sourcehook.h $(MAX_PARAMS); cp sourcehook.h ..)
../sourcehook.hxx: ../generate/sh_memfuncinfo.hxx
(cd ../generate; ./shworker.bin iter $(MAX_PARAMS) sh_memfuncinfo.hxx sh_memfuncinfo.h; cp sh_memfuncino.h ..)
(cd ../generate; ./shworker.bin iter sh_memfuncinfo.hxx sh_memfuncinfo.h $(MAX_PARAMS); cp sh_memfuncino.h ..)
../FastDelegate.hxx: ../generate/FastDelegate.hxx
(cd ../generate; ./shworker.bin iter $(MAX_PARAMS) FastDelegate.hxx FastDelegate.h; cp FastDelegate.h ..)
(cd ../generate; ./shworker.bin iter FastDelegate.hxx FastDelegate.h $(MAX_PARAMS); cp FastDelegate.h ..)
debug:
$(MAKE) all DEBUG=true