Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp/compat
Modified Files:
AssertionFailedError.cpp Exception.h
Log Message:
forward failures without execptions
Index: AssertionFailedError.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- AssertionFailedError.cpp 3 Dec 2005 13:10:30 -0000 1.16
+++ AssertionFailedError.cpp 23 Dec 2005 22:03:30 -0000 1.17
@@ -29,7 +29,6 @@
#include <mockpp/mockpp.h> // always first
-
#include <mockpp/compat/AssertionFailedError.h>
@@ -58,11 +57,23 @@
}
+void defaultAssertionFailedForwarder(const AssertionFailedError &err)
+{
+ MOCKPP_THROW(err);
+}
+
+
+AssertionFailedForwarder_t forwardAssertionFailed = defaultAssertionFailedForwarder;
+
+
MOCKPP_EXPORT
void assertionFailed(unsigned srcline, const char* srcfile,
const String &message)
{
- forwardMalfunctionData(AssertionFailedError(srcline, srcfile, message));
+ if (forwardAssertionFailed != 0)
+ forwardAssertionFailed(AssertionFailedError(srcline, srcfile, message));
+ else
+ defaultAssertionFailedForwarder(AssertionFailedError(srcline, srcfile, message));
}
Index: Exception.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Exception.h 3 Dec 2005 13:10:30 -0000 1.17
+++ Exception.h 23 Dec 2005 22:03:30 -0000 1.18
@@ -87,6 +87,7 @@
#endif
private:
+
String message;
unsigned srcline;
String srcfile;
@@ -96,18 +97,6 @@
};
-/** Handle exceptions based on errors and failures.
- * The default implementation throws the object.
- * @param e excption data
- */
-template <typename T>
-inline
-void forwardMalfunctionData(const T &e)
-{
- MOCKPP_THROW(e);
-}
-
-
} // namespace mockpp
|
