diff -r bee78b10b2c0 -r b35a5fdbc654 core-legacy/sourcehook/test/testbail.cpp --- a/core-legacy/sourcehook/test/testbail.cpp Fri Feb 27 00:19:50 2009 -0600 +++ b/core-legacy/sourcehook/test/testbail.cpp Wed Oct 28 23:14:32 2009 -0700 @@ -44,7 +44,7 @@ g_Gabgab = new IGaben; - SH_ADD_HOOK_STATICFUNC(IGaben, EatYams, g_Gabgab, EatYams_Handler1, false); + SH_ADD_HOOK(IGaben, EatYams, g_Gabgab, SH_STATIC(EatYams_Handler1), false); ADD_STATE(State_EatYams_Return(g_Gabgab->EatYams(0xDEAD))); @@ -75,7 +75,7 @@ new State_EatYams_Return(5), NULL), "Part 3"); - SH_REMOVE_HOOK_STATICFUNC(IGaben, EatYams, g_Gabgab, EatYams_Handler1, false); + SH_REMOVE_HOOK(IGaben, EatYams, g_Gabgab, SH_STATIC(EatYams_Handler1), false); ADD_STATE(State_EatYams_Return(g_Gabgab->EatYams(0xDEAD))); @@ -97,7 +97,7 @@ new State_EatYams_Called(0xBEEF), NULL), "Part 5"); - SH_ADD_HOOK_STATICFUNC(IGaben, EatYams, g_Gabgab, EatYams_Handler1, false); + SH_ADD_HOOK(IGaben, EatYams, g_Gabgab, SH_STATIC(EatYams_Handler1), false); ADD_STATE(State_EatYams_Return(g_Gabgab->EatYams(0xDEAD))); @@ -109,10 +109,6 @@ new State_EatYams_Return(6), NULL), "Part 6"); - SH_REMOVE_HOOK_STATICFUNC(IGaben, EatYams, g_Gabgab, EatYams_Handler1, false); - - UntestBail2(); - delete g_Gabgab; return true;