cppunit-cvs

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

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

Modified Files:
	conststring.h 
Log Message:
* removed some warnings.

Index: conststring.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/conststring.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** conststring.h	27 Feb 2005 17:12:17 -0000	1.4
--- conststring.h	28 Feb 2005 20:32:35 -0000	1.5
***************
*** 493,497 ****
        break;
     case cszString:
!       length_ = strlen( csz_ );
        break;
     case string:
--- 493,497 ----
        break;
     case cszString:
!       length_ = size_type( strlen( csz_ ) );
        break;
     case string:
***************
*** 503,507 ****
  # ifndef CPPTL_CONSTSTRING_NO_STDSTRING
     case stdString:
!       length_ = stdString_->length();
        break;
  # endif
--- 503,507 ----
  # ifndef CPPTL_CONSTSTRING_NO_STDSTRING
     case stdString:
!       length_ = size_type( stdString_->length() );
        break;
  # endif
***************
*** 557,561 ****
  inline
  ConstString::ConstString( const value_type *csz )
!    : length_( csz ? strlen( csz ) : 0 )
     , buffer_( new value_type[length_+1] )
  {
--- 557,561 ----
  inline
  ConstString::ConstString( const value_type *csz )
!    : length_( csz ? size_type(strlen( csz )) : 0 )
     , buffer_( new value_type[length_+1] )
  {
***************
*** 567,571 ****
  inline
  ConstString::ConstString( const value_type *begin, const value_type *end )
!    : length_( end - begin )
     , buffer_( new value_type[end-begin+1] )
  {
--- 567,571 ----
  inline
  ConstString::ConstString( const value_type *begin, const value_type *end )
!    : length_( size_type(end - begin) )
     , buffer_( new value_type[end-begin+1] )
  {
***************
*** 608,612 ****
  inline
  ConstString::ConstString( const std::string &string )
!    : length_( string.length() )
     , buffer_( new value_type[length_+1] )
  {
--- 608,612 ----
  inline
  ConstString::ConstString( const std::string &string )
!    : length_( size_type(string.length()) )
     , buffer_( new value_type[length_+1] )
  {
***************
*** 996,1000 ****
  StringBuffer::operator +=( const char *other )
  {
!    size_type otherLength = strlen(other);
     size_type newLength = length_ + otherLength;
     prepareBuffer( newLength );
--- 996,1000 ----
  StringBuffer::operator +=( const char *other )
  {
!    size_type otherLength = size_type(strlen(other));
     size_type newLength = length_ + otherLength;
     prepareBuffer( newLength );