Update of /cvsroot/cppunit/cppunit2/src/cpput
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26100/src/cpput
Modified Files:
exceptionguard.cpp testinfo.cpp
Log Message:
- synchronized with lastest jsoncpp.
Index: testinfo.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testinfo.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** testinfo.cpp 11 Nov 2005 20:54:15 -0000 1.20
--- testinfo.cpp 5 Jun 2006 13:22:58 -0000 1.21
***************
*** 463,467 ****
void log( const CppTL::ConstString &log )
{
! TestInfo::threadInstance().log( log );
}
--- 463,467 ----
void log( const CppTL::ConstString &log )
{
! TestInfo::threadInstance().log( log.c_str() );
}
Index: exceptionguard.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/exceptionguard.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** exceptionguard.cpp 13 Nov 2005 10:12:01 -0000 1.10
--- exceptionguard.cpp 5 Jun 2006 13:22:58 -0000 1.11
***************
*** 91,95 ****
fault.setMessages( messages );
fault.setTestDataType( "unexpected-exception-fault" );
! fault.setTestData( "expection-type", exceptionType );
fault.setTestData( "expection-message", what );
TestInfo::threadInstance().handleUnexpectedException( fault );
--- 91,95 ----
fault.setMessages( messages );
fault.setTestDataType( "unexpected-exception-fault" );
! fault.setTestData( "expection-type", exceptionType.c_str() );
fault.setTestData( "expection-message", what );
TestInfo::threadInstance().handleUnexpectedException( fault );
|
