[Mockpp-commits] mockpp/mockpp/tests InvocationMocker_test.cpp,1.29,1.30

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31668/mockpp/tests

Modified Files:
	InvocationMocker_test.cpp 
Log Message:
fixes for cygwin (unicode+ascii)

Index: InvocationMocker_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- InvocationMocker_test.cpp	25 Mar 2005 17:20:35 -0000	1.29
+++ InvocationMocker_test.cpp	2 Apr 2005 13:46:34 -0000	1.30
@@ -39,6 +39,7 @@
 
 #include <mockpp/chaining/mockpp_pti.h>
 #include <mockpp/stub/ReturnStub.h>
+#include <mockpp/stub/ThrowStub.h>
 
 #include <mockpp/constraint/IsEqual.h>
 #include <mockpp/constraint/IsGreaterThan.h>
@@ -48,6 +49,11 @@
 #include "classes_ABCDE.h"
 
 
+typedef mockpp::Invocation5<CA, CB, CC, CD, CE> SetterInvocation;
+typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation;
+
+MOCKPP_PTI_DECLARE(SetterInvocation)
+
 namespace {
 
 
@@ -163,8 +169,6 @@
 };
 
 
-typedef mockpp::Invocation5<CA, CB, CC, CD, CE> SetterInvocation;
-typedef mockpp::Invocation5<CA, CB, CC, CD, CE> GetterInvocation;
 
 
 void InvocationMocker_test::test_instance()
@@ -175,9 +179,6 @@
 }
 
 
-MOCKPP_PTI_DECLARE(SetterInvocation)
-
-
 void InvocationMocker_test::test_instance_void()
 {
   mockpp::InvocationMocker<void, SetterInvocation> im;
@@ -356,7 +357,7 @@
 }
 
 
-MOCKPP_PTI_IMPLEMENT(SetterInvocation)
+//MOCKPP_PTI_IMPLEMENT(SetterInvocation)
 
 
 } // namespace