diff --git a/code/nel/include/nel/misc/sstring.h b/code/nel/include/nel/misc/sstring.h index 2060d6069..e88f4252e 100644 --- a/code/nel/include/nel/misc/sstring.h +++ b/code/nel/include/nel/misc/sstring.h @@ -333,10 +333,10 @@ public: CSString replace(const char *toFind,const char *replacement) const; /// Find index at which a sub-string starts (case not sensitive) - if sub-string not found then returns string::npos - unsigned find(const char *toFind,unsigned startLocation=0) const; + std::string::size_type find(const char *toFind, std::string::size_type startLocation=0) const; /// Find index at which a sub-string starts (case NOT sensitive) - if sub-string not found then returns string::npos - unsigned findNS(const char *toFind,unsigned startLocation=0) const; + std::string::size_type findNS(const char *toFind, std::string::size_type startLocation=0) const; /// Return true if this contains given sub string bool contains(const char *toFind) const; @@ -346,8 +346,8 @@ public: /// Handy atoi routines... int atoi() const; - signed atosi() const; - unsigned atoui() const; + sint32 atosi() const; + uint32 atoui() const; sint64 atoi64() const; sint64 atosi64() const; uint64 atoui64() const; diff --git a/code/nel/src/misc/sstring.cpp b/code/nel/src/misc/sstring.cpp index d023f152a..9c5bf1422 100644 --- a/code/nel/src/misc/sstring.cpp +++ b/code/nel/src/misc/sstring.cpp @@ -1325,7 +1325,7 @@ namespace NLMISC if (toFind==NULL || *toFind==0) return *this; - unsigned i,j; + std::string::size_type i,j; CSString result; for (i=0;i=size()) - return (unsigned)std::string::npos; + return std::string::npos; - unsigned i,j; + std::string::size_type i,j; for (i=startLocation;i=size()) - return (unsigned)std::string::npos; + return std::string::npos; - unsigned i,j; + std::string::size_type i,j; for (i=startLocation;i