1.1 --- a/sourcehook/test/test2.cpp Fri Sep 28 21:32:02 2007 +0000
1.2 +++ b/sourcehook/test/test2.cpp Fri Sep 28 21:40:58 2007 +0000
1.3 @@ -50,6 +50,11 @@
1.4 }
1.5 };
1.6
1.7 + // GCC's optimizer is too good. I had to add this in order to make it execute a virtual table lookup!
1.8 + class Whatever : public IGaben
1.9 + {
1.10 + };
1.11 +
1.12 SH_DECL_HOOK0_void(IGaben, EatYams, SH_NOATTRIB, 0);
1.13 SH_DECL_HOOK1(IGaben, EatYams, const, 1, bool, const char *);
1.14 SH_DECL_HOOK2_void_vafmt(IGaben, Vafmt1, SH_NOATTRIB, 0, bool, int);
1.15 @@ -92,14 +97,12 @@
1.16 GET_SHPTR(g_SHPtr);
1.17 g_PLID = 1337;
1.18
1.19 - IGaben gabgab;
1.20 + Whatever gabgab;
1.21 IGaben *pGab = &gabgab;
1.22
1.23 - SourceHook::CallClass<IGaben> *cc = SH_GET_CALLCLASS(pGab);
1.24 -
1.25 // Part 1
1.26 - SH_CALL(cc, static_cast<void (IGaben::*)()>(&IGaben::EatYams))();
1.27 - SH_CALL(cc, static_cast<bool (IGaben::*)(const char *) const>(&IGaben::EatYams))("Here!");
1.28 + SH_CALL(pGab, static_cast<void (IGaben::*)()>(&IGaben::EatYams))();
1.29 + SH_CALL(pGab, static_cast<bool (IGaben::*)(const char *) const>(&IGaben::EatYams))("Here!");
1.30
1.31 SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams0_Handler, false);
1.32 SH_ADD_HOOK(IGaben, EatYams, pGab, EatYams1_Handler, false);
1.33 @@ -121,9 +124,9 @@
1.34
1.35 // Part 2
1.36 pGab->Vafmt1(true, 55, "Hello %s%d%s", "BA", 1, "L");
1.37 - SH_CALL(cc, &IGaben::Vafmt1)(true, 55, "Hello %s%d%s", "BA", 1, "L");
1.38 + SH_CALL(pGab, &IGaben::Vafmt1)(true, 55, "Hello %s%d%s", "BA", 1, "L");
1.39 pGab->Vafmt2("Hello %s%d%s", "BA", 1, "LOPAN");
1.40 - SH_CALL(cc, &IGaben::Vafmt2)("Hello %s%d%s", "BA", 1, "LOPAN");
1.41 + SH_CALL(pGab, &IGaben::Vafmt2)("Hello %s%d%s", "BA", 1, "LOPAN");
1.42
1.43 CHECK_STATES((&g_States,
1.44 new State_Vafmt_Called(1, "Hello BA1L"),
1.45 @@ -165,7 +168,5 @@
1.46 new State_Vafmt_Called(2, "Hello BA1LOPAN"),
1.47 NULL), "Part 4");
1.48
1.49 - SH_RELEASE_CALLCLASS(cc);
1.50 -
1.51 return true;
1.52 }