sourcehook/test/testreentr.cpp
changeset 380 f9e21a2ac558
parent 324 257f0837a885
     1.1 --- a/sourcehook/test/testreentr.cpp	Sun Oct 07 03:12:19 2007 +0000
     1.2 +++ b/sourcehook/test/testreentr.cpp	Sun Oct 07 22:10:07 2007 +0000
     1.3 @@ -82,7 +82,6 @@
     1.4  			return 1;
     1.5  		}
     1.6  	};
     1.7 -
     1.8  	struct C2
     1.9  	{
    1.10  		virtual void F()
    1.11 @@ -168,15 +167,6 @@
    1.12  		}
    1.13  	};
    1.14  
    1.15 -	struct C1_Derived : public C1 {};
    1.16 -	struct C2_Derived : public C2 {};
    1.17 -	struct C3_Derived : public C3 {};
    1.18 -	struct C4_Derived : public C4 {};
    1.19 -	struct C5_Derived : public C5 {};
    1.20 -	struct C6_Derived : public C6 {};
    1.21 -	struct C7_Derived : public C7 {};
    1.22 -	struct C8_Derived : public C8 {};
    1.23 -
    1.24  	SH_DECL_HOOK0_void(C1, F, SH_NOATTRIB, 0);
    1.25  	SH_DECL_HOOK0(C1, G, SH_NOATTRIB, 0, int);
    1.26  	SH_DECL_HOOK0_void(C2, F, SH_NOATTRIB, 0);
    1.27 @@ -292,14 +282,14 @@
    1.28  		return 8;
    1.29  	}
    1.30  
    1.31 -	C1_Derived g_C1;
    1.32 -	C2_Derived g_C2;
    1.33 -	C3_Derived g_C3;
    1.34 -	C4_Derived g_C4;
    1.35 -	C5_Derived g_C5;
    1.36 -	C6_Derived g_C6;
    1.37 -	C7_Derived g_C7;
    1.38 -	C8_Derived g_C8;
    1.39 +	C1 g_C1;
    1.40 +	C2 g_C2;
    1.41 +	C3 g_C3;
    1.42 +	C4 g_C4;
    1.43 +	C5 g_C5;
    1.44 +	C6 g_C6;
    1.45 +	C7 g_C7;
    1.46 +	C8 g_C8;
    1.47  }
    1.48  
    1.49  bool TestReentr(std::string &error)
    1.50 @@ -332,7 +322,7 @@
    1.51  	SH_ADD_HOOK(C7, G, g_pC7, SH_STATIC(Handler_C7_G), false);
    1.52  	SH_ADD_HOOK(C8, F, g_pC8, SH_STATIC(Handler_C8_F), false);
    1.53  	SH_ADD_HOOK(C8, G, g_pC8, SH_STATIC(Handler_C8_G), false);
    1.54 -
    1.55 +		
    1.56  	g_pC1->F();
    1.57  
    1.58  	CHECK_STATES((&g_States,