From 7c71e0ce013ce93a131777229632ae78283b524a Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 5 Aug 2010 18:54:32 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- .../ryzom/tools/leveldesign/georges_convert/string_ex.cpp | 8 ++++---- code/ryzom/tools/leveldesign/georges_convert/string_ex.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/leveldesign/georges_convert/string_ex.cpp b/code/ryzom/tools/leveldesign/georges_convert/string_ex.cpp index 1b63cead9..86ac505f3 100644 --- a/code/ryzom/tools/leveldesign/georges_convert/string_ex.cpp +++ b/code/ryzom/tools/leveldesign/georges_convert/string_ex.cpp @@ -312,18 +312,18 @@ bool CStringEx::operator < ( const CStringEx& s ) const return( is != s.end() ); } -int CStringEx::reverse_find( const char _c ) const +std::string::size_type CStringEx::reverse_find( const char _c ) const { - unsigned int i = length(); + size_type i = length(); const_iterator it = end(); while( it != begin() ) { --it; --i; if( *it == _c ) - return( i ); + return i ; } - return( npos ); + return npos; } void CStringEx::format( const char* s, ... ) diff --git a/code/ryzom/tools/leveldesign/georges_convert/string_ex.h b/code/ryzom/tools/leveldesign/georges_convert/string_ex.h index e010ba1fc..69489c4ac 100644 --- a/code/ryzom/tools/leveldesign/georges_convert/string_ex.h +++ b/code/ryzom/tools/leveldesign/georges_convert/string_ex.h @@ -65,7 +65,7 @@ public: void purge(); void format( const char*, ... ); - int reverse_find( const char _c ) const; + std::string::size_type reverse_find( const char _c ) const; void serial( NLMISC::IStream& s ) { s.serial( (std::string&)(*this) );}