sourcehook/test/testref.cpp
branchsourcemm-1.6.0
changeset 361 f34718303c8f
parent 347 e82968c21606
     1.1 --- a/sourcehook/test/testref.cpp	Fri Sep 28 21:32:02 2007 +0000
     1.2 +++ b/sourcehook/test/testref.cpp	Fri Sep 28 21:40:58 2007 +0000
     1.3 @@ -76,6 +76,7 @@
     1.4  			return sth.Func();
     1.5  		}
     1.6  	};
     1.7 +	class CHelloDerived : public CHello { };
     1.8  
     1.9  	class CHook
    1.10  	{
    1.11 @@ -99,12 +100,10 @@
    1.12  	CDerived der;
    1.13  	CDerived2 der2(11);
    1.14  	CDerived2 der3(12);
    1.15 -	CHello hello;
    1.16 +	CHelloDerived hello;
    1.17  	CHello *pHello = &hello;
    1.18  	CHook hook;
    1.19  
    1.20 -	SourceHook::CallClass<CHello> *cc = SH_GET_CALLCLASS(&hello);
    1.21 -
    1.22  	ADD_STATE(State_Result(pHello->Func(base)));
    1.23  	ADD_STATE(State_Result(pHello->Func(der)));
    1.24  	ADD_STATE(State_Result(pHello->Func(der2)));
    1.25 @@ -117,10 +116,10 @@
    1.26  		new State_Result(12),
    1.27  		NULL), "Part 1");
    1.28  
    1.29 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base)));
    1.30 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der)));
    1.31 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2)));
    1.32 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3)));
    1.33 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(base)));
    1.34 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der)));
    1.35 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der2)));
    1.36 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der3)));
    1.37  
    1.38  	CHECK_STATES((&g_States,
    1.39  		new State_Result(0),
    1.40 @@ -129,7 +128,7 @@
    1.41  		new State_Result(12),
    1.42  		NULL), "Part 2");
    1.43  
    1.44 -	SH_ADD_HOOK_MEMFUNC(CHello, Func, &hello, &hook, &CHook::Func, false);
    1.45 +	SH_ADD_HOOK(CHello, Func, &hello, SH_MEMBER(&hook, &CHook::Func), false);
    1.46  
    1.47  	ADD_STATE(State_Result(pHello->Func(base)));
    1.48  	ADD_STATE(State_Result(pHello->Func(der)));
    1.49 @@ -147,10 +146,10 @@
    1.50  		new State_Result(20),
    1.51  		NULL), "Part 3");
    1.52  
    1.53 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base)));
    1.54 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der)));
    1.55 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2)));
    1.56 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3)));
    1.57 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(base)));
    1.58 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der)));
    1.59 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der2)));
    1.60 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der3)));
    1.61  
    1.62  	CHECK_STATES((&g_States,
    1.63  		new State_Result(0),