diff -r 0e01c64820e1 -r 3a04ef79edf1 sourcehook/test/test2.cpp --- a/sourcehook/test/test2.cpp Fri May 11 19:21:14 2007 +0000 +++ b/sourcehook/test/test2.cpp Sat May 12 08:08:01 2007 +0000 @@ -100,11 +100,9 @@ Whatever gabgab; IGaben *pGab = &gabgab; - SourceHook::CallClass *cc = SH_GET_CALLCLASS(pGab); - // Part 1 - SH_CALL(cc, static_cast(&IGaben::EatYams))(); - SH_CALL(cc, static_cast(&IGaben::EatYams))("Here!"); + SH_CALL(pGab, static_cast(&IGaben::EatYams))(); + SH_CALL(pGab, static_cast(&IGaben::EatYams))("Here!"); SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams0_Handler, false); SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams1_Handler, false); @@ -126,9 +124,9 @@ // Part 2 pGab->Vafmt1(true, 55, "Hello %s%d%s", "BA", 1, "L"); - SH_CALL(cc, &IGaben::Vafmt1)(true, 55, "Hello %s%d%s", "BA", 1, "L"); + SH_CALL(pGab, &IGaben::Vafmt1)(true, 55, "Hello %s%d%s", "BA", 1, "L"); pGab->Vafmt2("Hello %s%d%s", "BA", 1, "LOPAN"); - SH_CALL(cc, &IGaben::Vafmt2)("Hello %s%d%s", "BA", 1, "LOPAN"); + SH_CALL(pGab, &IGaben::Vafmt2)("Hello %s%d%s", "BA", 1, "LOPAN"); CHECK_STATES((&g_States, new State_Vafmt_Called(1, "Hello BA1L"), @@ -170,7 +168,5 @@ new State_Vafmt_Called(2, "Hello BA1LOPAN"), NULL), "Part 4"); - SH_RELEASE_CALLCLASS(cc); - return true; }