diff -r 4a0c5136f5e1 -r 53e363661d53 sourcehook/test/testevents.h --- a/sourcehook/test/testevents.h Sun Nov 11 17:35:24 2007 +0000 +++ b/sourcehook/test/testevents.h Sun Nov 11 18:51:56 2007 +0000 @@ -19,6 +19,19 @@ extern bool g_Verbose; +static unsigned int MakeHash(const char *name) +{ + int a = 0; + unsigned int res = 0xFFFFFFFF; + + while (*name) + { + res ^= ((unsigned int)*name << ((a++ % 4)*8)); + ++name; + } + return res; +} + struct State { virtual ~State() @@ -28,7 +41,7 @@ virtual bool IsEqual(State *other) { - return (typeid(other) == typeid(this)) ? true : false; + return (MakeHash(GetName()) == MakeHash(other->GetName())) ? true : false; } virtual bool Ignore() @@ -37,6 +50,7 @@ } virtual void Dump() = 0; + virtual const char *GetName() = 0; }; struct IgnoreState : public State @@ -130,6 +144,7 @@ #define MAKE_STATE(name) struct name : State { \ virtual void Dump() { \ std::cout << " " << #name << std::endl; } \ + const char *GetName() { return #name; } \ }; #define MAKE_STATE_1(name, p1_type) struct name : State { \ @@ -143,6 +158,7 @@ } \ virtual void Dump() { \ std::cout << " " << #name << "; Param1=" << m_Param1 << std::endl; } \ + const char *GetName() { return #name; } \ } #define MAKE_STATE_2(name, p1_type, p2_type) struct name : State { \ @@ -157,6 +173,7 @@ } \ virtual void Dump() { \ std::cout << " " << #name << "; Param1=" << m_Param1 << "; Param2=" << m_Param2 << std::endl; } \ + const char *GetName() { return #name; } \ } #define MAKE_STATE_3(name, p1_type, p2_type, p3_type) struct name : State { \ @@ -172,6 +189,7 @@ } \ virtual void Dump() { \ std::cout << " " << #name << "; Param1=" << m_Param1 << "; Param2=" << m_Param2 << "; Param3=" << m_Param3 << std::endl; } \ + const char *GetName() { return #name; } \ } #define CHECK_COND(c, err) if (!(c)) { error = err; return false; }