Update of /cvsroot/mockpp/mockpp/mockpp/chaining
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19465/mockpp/chaining
Modified Files:
AbstractDynamicChainingMock.h
Log Message:
forward failures without execptions
Index: AbstractDynamicChainingMock.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- AbstractDynamicChainingMock.h 3 Dec 2005 13:10:30 -0000 1.38
+++ AbstractDynamicChainingMock.h 23 Dec 2005 22:03:30 -0000 1.39
@@ -318,7 +318,7 @@
virtual void mockInvocation( const I &invocation )
{
if ( this->failure.get() != 0 )
- forwardMalfunctionData(*this->failure.get());
+ MOCKPP_THROW(*this->failure.get());
MOCKPP_TRY
{
@@ -333,7 +333,7 @@
this->invocationDispatcher.get(),
assertion.getMessage() );
this->failure.reset( new AssertionFailedError(__LINE__, __FILE__, dme.getMessage()));
- forwardMalfunctionData(*this->failure.get());
+ MOCKPP_THROW(*this->failure.get());
}
#endif // MOCKPP_NO_EXCEPTIONS
}
@@ -380,7 +380,7 @@
void mockInvocation( const I &invocation ) \
{ \
if ( this->failure.get() != 0 ) \
- forwardMalfunctionData(*this->failure.get()); \
+ MOCKPP_THROW(*this->failure.get()); \
\
try \
{ \
@@ -394,7 +394,7 @@
this->invocationDispatcher.get(), \
assertion.getMessage() ); \
this->failure.reset( new AssertionFailedError(__LINE__, __FILE__, dme.getMessage())); \
- forwardMalfunctionData(*this->failure.get()); \
+ MOCKPP_THROW(*this->failure.get()); \
} \
} \
}; \
|
