Update of /cvsroot/cppunit/cppunit2/include/cpptl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6802/include/cpptl
Modified Files:
conststring.h typename.h
Log Message:
- changed most interface to use std::string instead of CppTL::ConstString
- CppTL::ConstString is now an implementation detail and is used to store string in objects as it is thread-safe.
Index: typename.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/typename.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** typename.h 6 Mar 2005 18:36:46 -0000 1.2
--- typename.h 8 Nov 2005 21:44:54 -0000 1.3
***************
*** 15,19 ****
# ifndef CPPTL_NO_RTTI
! inline CppTL::ConstString CPPUT_API
demangleTypeInfoName( const std::type_info &type )
{
--- 15,19 ----
# ifndef CPPTL_NO_RTTI
! inline std::string CPPUT_API
demangleTypeInfoName( const std::type_info &type )
{
***************
*** 25,35 ****
while ( startIndex < typeName.length() && isDigit( typeName[startIndex] ) )
++startIndex;
! return typeName.substr(startIndex);
}
#endif
template<class AType>
! CppTL::ConstString getTypeName( CppTL::Type<AType>,
! const char *hint )
{
# ifndef CPPTL_NO_RTTI
--- 25,35 ----
while ( startIndex < typeName.length() && isDigit( typeName[startIndex] ) )
++startIndex;
! return typeName.substr(startIndex).str();
}
#endif
template<class AType>
! std::string getTypeName( CppTL::Type<AType>,
! const char *hint )
{
# ifndef CPPTL_NO_RTTI
***************
*** 42,47 ****
template<typename Object>
! CppTL::ConstString getObjectTypeName( const Object &object,
! const char *hint )
{
# ifndef CPPTL_NO_RTTI
--- 42,47 ----
template<typename Object>
! std::string getObjectTypeName( const Object &object,
! const char *hint )
{
# ifndef CPPTL_NO_RTTI
Index: conststring.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/conststring.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** conststring.h 4 Jul 2005 08:09:30 -0000 1.7
--- conststring.h 8 Nov 2005 21:44:54 -0000 1.8
***************
*** 916,920 ****
ConstString::str() const
{
! return std::string( c_str(), end_c_str() );
}
# endif
--- 916,921 ----
ConstString::str() const
{
! return buffer_ ? std::string( c_str(), end_c_str() )
! : std::string();
}
# endif
|
