[Mockpp-commits] mockpp/mockpp/tests LIFOInvocationDispatcher_test.cpp,1.16,1.17 FIFOInvocationDispatcher_test.cpp,1.17,1.18

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

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

Modified Files:
	LIFOInvocationDispatcher_test.cpp 
	FIFOInvocationDispatcher_test.cpp 
Log Message:
patch msvc6

Index: LIFOInvocationDispatcher_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/LIFOInvocationDispatcher_test.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- LIFOInvocationDispatcher_test.cpp	25 Mar 2005 17:20:35 -0000	1.16
+++ LIFOInvocationDispatcher_test.cpp	6 Apr 2005 19:28:59 -0000	1.17
@@ -46,6 +46,14 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
+typedef mockpp::Invocation0 GetterInvocation;
+typedef mockpp::Invocation0 VoidInvocation;
+
+
+MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(VoidInvocation)
+MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(VoidInvocation)
+
+
 namespace {
 
 
@@ -70,10 +78,6 @@
 CPPUNIT_TEST_SUITE_REGISTRATION(LIFOInvocationDispatcher_test);
 
 
-typedef mockpp::Invocation0 GetterInvocation;
-typedef mockpp::Invocation0 VoidInvocation;
-
-
 template <typename R, typename I>
 class TestInvokable : public mockpp::Invokable<R,I>
 {
@@ -148,23 +152,30 @@
 };
 
 
-template <typename R, typename I>
-class LIFO : public mockpp::LIFOInvocationDispatcher<R,I>
-{
-  public:
-
-    virtual R doDispatch( const I &invocation )
-    {
-       return dispatch(invocation);
-    }
-
-    virtual void doVoidDispatch( const I &invocation )
-    {
-       dispatch(invocation);
-    }
-};
-
-
+template <typename R, typename I>
+class LIFO : public mockpp::LIFOInvocationDispatcher<R,I>
+{
+  public:
+
+    virtual R doDispatch( const I &invocation )
+    {
+       return dispatch(invocation);
+    }
+};
+
+
+template <typename I>
+class VoidLIFO : public mockpp::LIFOInvocationDispatcher<void, I>
+{
+  public:
+
+    virtual void doVoidDispatch( const I &invocation )
+    {
+       dispatch(invocation);
+    }
+};
+
+
 void LIFOInvocationDispatcher_test::test_dispatch()
 {
   GetterInvocation ginv(MOCKPP_PCHAR("TestClass::getProp"));
@@ -197,7 +208,7 @@
 {
   VoidInvocation ginv(MOCKPP_PCHAR("TestClass::voidProp"));
 
-  LIFO<void,VoidInvocation> id;
+  VoidLIFO<VoidInvocation> id;
   typedef TestVoidInvokable<VoidInvocation> TInvok;
 
   TInvok *ti1 = new TInvok();

Index: FIFOInvocationDispatcher_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/FIFOInvocationDispatcher_test.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- FIFOInvocationDispatcher_test.cpp	25 Mar 2005 17:20:35 -0000	1.17
+++ FIFOInvocationDispatcher_test.cpp	6 Apr 2005 19:28:59 -0000	1.18
@@ -46,6 +46,14 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
+typedef mockpp::Invocation0 GetterInvocation;
+typedef mockpp::Invocation0 VoidInvocation;
+
+
+MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(VoidInvocation)
+MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(VoidInvocation)
+
+
 namespace {
 
 
@@ -70,10 +78,6 @@
 CPPUNIT_TEST_SUITE_REGISTRATION(FIFOInvocationDispatcher_test);
 
 
-typedef mockpp::Invocation0 GetterInvocation;
-typedef mockpp::Invocation0 VoidInvocation;
-
-
 template <typename R, typename I>
 class TestInvokable : public mockpp::Invokable<R,I>
 {
@@ -148,23 +152,30 @@
 };
 
 
-template <typename R, typename I>
-class FIFO : public mockpp::FIFOInvocationDispatcher<R,I>
-{
-  public:
-
-    virtual R doDispatch( const I &invocation )
-    {
-       return dispatch(invocation);
-    }
-
-    virtual void doVoidDispatch( const I &invocation )
-    {
-       dispatch(invocation);
-    }
-};
-
-
+template <typename R, typename I>
+class FIFO : public mockpp::FIFOInvocationDispatcher<R,I>
+{
+  public:
+
+    virtual R doDispatch( const I &invocation )
+    {
+       return dispatch(invocation);
+    }
+};
+
+
+template <typename I>
+class VoidFIFO : public mockpp::FIFOInvocationDispatcher<void, I>
+{
+  public:
+
+    virtual void doVoidDispatch( const I &invocation )
+    {
+       dispatch(invocation);
+    }
+};
+
+
 void FIFOInvocationDispatcher_test::test_dispatch()
 {
   GetterInvocation ginv(MOCKPP_PCHAR("TestClass::getProp"));
@@ -197,7 +208,7 @@
 {
   VoidInvocation ginv(MOCKPP_PCHAR("TestClass::voidProp"));
 
-  FIFO<void,VoidInvocation> id;
+  VoidFIFO<VoidInvocation> id;
   typedef TestVoidInvokable<VoidInvocation> TInvok;
 
   TInvok *ti1 = new TInvok();