[Cppunit-cvs] cppunit2/include/cpput assert.h,1.7,1.8 testfixture.h,1.7,1.8 typehelper.h,1.4,NONE

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/include/cpput
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19549/cpput

Modified Files:
	assert.h testfixture.h 
Removed Files:
	typehelper.h 
Log Message:
* moved cpput/typehelper.h to cpptl/typename.h
* renamed helper functions: getObjectTypeName(), getTypeName() and demangleTypeInfoName()
* With mingw, typeinfo name is correctly extracted (skip initial digits)
* added automatic detection of the presence of RTTI with msvc.

Index: assert.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/assert.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** assert.h	27 Feb 2005 10:15:41 -0000	1.7
--- assert.h	28 Feb 2005 21:36:19 -0000	1.8
***************
*** 7,11 ****
  # include <cpput/testinfo.h>
  # include <cpput/translate.h>
! # include <cpput/typehelper.h>
  
  namespace CppUT
--- 7,11 ----
  # include <cpput/testinfo.h>
  # include <cpput/translate.h>
! # include <cpptl/typename.h>
  
  namespace CppUT
***************
*** 170,174 ****
        ::CppUT::Message message( "Unexpected exception caught" );           \
        message.add( "Type: " +                                              \
!                    ::CppUT::extractObjectType( e, "std::exception" ) );    \
        message.add( CppTL::ConstString("What: ") + e.what() );              \
        ::CppUT::fail( message );                                            \
--- 170,174 ----
        ::CppUT::Message message( "Unexpected exception caught" );           \
        message.add( "Type: " +                                              \
!                    ::CppTL::getObjectTypeName( e, "std::exception" ) );    \
        message.add( CppTL::ConstString("What: ") + e.what() );              \
        ::CppUT::fail( message );                                            \
***************
*** 177,190 ****
     }
  
- # define CPPUT_EXPRESSION_WRAPPER( expression, variable )   \
-       class Wrapper : public ::CppUT::ExpressionWrapper     \
-       {                                                     \
-       public: /* overridden from ExpressionWrapper */       \
-          void run() const                                   \
-          {                                                  \
-             expression;                                     \
-          }                                                  \
-       } variable
- 
  // Notes: implementing that assertion checking is a bit tricky since all the state
  // about the current test/assertions is stored in a "static" and
--- 177,180 ----

Index: testfixture.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/testfixture.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** testfixture.h	27 Feb 2005 14:38:26 -0000	1.7
--- testfixture.h	28 Feb 2005 21:36:19 -0000	1.8
***************
*** 6,10 ****
  # include <cpput/testsuite.h>
  # include <cpput/translate.h>
! # include <cpput/typehelper.h>
  
  
--- 6,10 ----
  # include <cpput/testsuite.h>
  # include <cpput/translate.h>
! # include <cpptl/typename.h>
  
  
***************
*** 120,124 ****
     static CppTL::ConstString defaultSuiteName()
     {
!       return ::CppUT::extractType<CppUT_ThisType>( #FixtureType );
     }
  
--- 120,124 ----
     static CppTL::ConstString defaultSuiteName()
     {
!       return ::CppTL::getTypeName<CppUT_ThisType>( #FixtureType );
     }
  
***************
*** 157,161 ****
  # if CPPUT_USE_RTTI_TO_NAME_SUITE
  #  define CPPUT_TESTSUITE_NAME_FROM_TYPE( FixtureType )					\
!       ::CppUT::extractType( ::CppTL::Type<FixtureType>(), #FixtureType )
  # else // if CPPUT_USE_RTTI_TO_NAME_SUITE
  #  define CPPUT_TESTSUITE_NAME_FROM_TYPE( FixtureType )					\
--- 157,161 ----
  # if CPPUT_USE_RTTI_TO_NAME_SUITE
  #  define CPPUT_TESTSUITE_NAME_FROM_TYPE( FixtureType )					\
!       ::CppTL::getTypeName( ::CppTL::Type<FixtureType>(), #FixtureType )
  # else // if CPPUT_USE_RTTI_TO_NAME_SUITE
  #  define CPPUT_TESTSUITE_NAME_FROM_TYPE( FixtureType )					\

--- typehelper.h DELETED ---