[Mockpp-commits] mockpp/mockpp Throwable.h,1.17,1.18 mockpp.cpp,1.21,1.22 mockpp.h,1.67,1.68

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

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

Modified Files:
	Throwable.h mockpp.cpp mockpp.h 
Log Message:
forward failures without execptions

Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- mockpp.h	18 Dec 2005 16:56:23 -0000	1.67
+++ mockpp.h	23 Dec 2005 22:03:30 -0000	1.68
@@ -196,11 +196,11 @@
 
 #ifndef MOCKPP_NO_EXCEPTIONS
 
-#define MOCKPP_THROW(x) throw (x)
-#define MOCKPP_RETHROW  throw
-#define MOCKPP_TRY  try
-#define MOCKPP_CATCH(x) (x)
-#define MOCKPP_CATCH_ALL catch(...)
+#define MOCKPP_THROW(x)   throw (x)
+#define MOCKPP_RETHROW    throw
+#define MOCKPP_TRY        try
+#define MOCKPP_CATCH(x)   (x)
+#define MOCKPP_CATCH_ALL  catch(...)
 
 #else
 
@@ -480,6 +480,16 @@
     return latin1;
   }
 
+  class AssertionFailedError;
+  typedef void (*AssertionFailedForwarder_t)(const AssertionFailedError &err);
+
+/** Sets the function pointer which handels failed assertions.
+  * @param  fwd  pointer to function.
+  * @return previous pointer
+  */
+  AssertionFailedForwarder_t
+  setAssertionFailedForwarder(AssertionFailedForwarder_t fwd);
+
 }  // namespace mockpp
 
 #ifdef MOCKPP_UNICODE

Index: mockpp.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mockpp.cpp	26 Nov 2005 18:00:16 -0000	1.21
+++ mockpp.cpp	23 Dec 2005 22:03:30 -0000	1.22
@@ -121,4 +121,15 @@
 
 #endif
 
+extern AssertionFailedForwarder_t forwardAssertionFailed;
+
+AssertionFailedForwarder_t
+setAssertionFailedForwarder(AssertionFailedForwarder_t fwd)
+{
+  AssertionFailedForwarder_t temp = forwardAssertionFailed;
+  forwardAssertionFailed = fwd;
+  return temp;
+}
+
+
 }  // namespace mockpp

Index: Throwable.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Throwable.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Throwable.h	3 Dec 2005 13:10:12 -0000	1.17
+++ Throwable.h	23 Dec 2005 22:03:30 -0000	1.18
@@ -76,7 +76,7 @@
     virtual void throw_me()
     {
        ++thrown;
-       forwardMalfunctionData(obj);
+       MOCKPP_THROW(obj);
     }