sourcehook/test/testref.cpp
changeset 328 3a04ef79edf1
parent 324 257f0837a885
child 380 f9e21a2ac558
     1.1 --- a/sourcehook/test/testref.cpp	Fri May 11 19:21:14 2007 +0000
     1.2 +++ b/sourcehook/test/testref.cpp	Sat May 12 08:08:01 2007 +0000
     1.3 @@ -104,8 +104,6 @@
     1.4  	CHello *pHello = &hello;
     1.5  	CHook hook;
     1.6  
     1.7 -	SourceHook::CallClass<CHello> *cc = SH_GET_CALLCLASS(pHello);
     1.8 -
     1.9  	ADD_STATE(State_Result(pHello->Func(base)));
    1.10  	ADD_STATE(State_Result(pHello->Func(der)));
    1.11  	ADD_STATE(State_Result(pHello->Func(der2)));
    1.12 @@ -118,10 +116,10 @@
    1.13  		new State_Result(12),
    1.14  		NULL), "Part 1");
    1.15  
    1.16 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base)));
    1.17 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der)));
    1.18 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2)));
    1.19 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3)));
    1.20 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(base)));
    1.21 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der)));
    1.22 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der2)));
    1.23 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der3)));
    1.24  
    1.25  	CHECK_STATES((&g_States,
    1.26  		new State_Result(0),
    1.27 @@ -148,10 +146,10 @@
    1.28  		new State_Result(20),
    1.29  		NULL), "Part 3");
    1.30  
    1.31 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(base)));
    1.32 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der)));
    1.33 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der2)));
    1.34 -	ADD_STATE(State_Result(SH_CALL(cc, &CHello::Func)(der3)));
    1.35 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(base)));
    1.36 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der)));
    1.37 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der2)));
    1.38 +	ADD_STATE(State_Result(SH_CALL(pHello, &CHello::Func)(der3)));
    1.39  
    1.40  	CHECK_STATES((&g_States,
    1.41  		new State_Result(0),