From: Mikko Rasa Date: Sun, 20 Sep 2009 16:18:06 +0000 (+0000) Subject: Fix compile errors on 64-bit systems X-Git-Tag: fs-1.1~1 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=d3c9b9abb9e3c69aeecbca1044b43e7ec83f3b8c;p=libs%2Fcore.git Fix compile errors on 64-bit systems --- diff --git a/source/path.cpp b/source/path.cpp index 5424cb1..d8a2c71 100644 --- a/source/path.cpp +++ b/source/path.cpp @@ -141,12 +141,12 @@ Path::Iterator Path::end() const void Path::init(const string &p) { - unsigned start=0; + string::size_type start=0; if(p[0]=='/' || p[0]=='\\') add_component(string(1, DIRSEP)); while(1) { - unsigned slash=p.find_first_of("/\\", start); + string::size_type slash=p.find_first_of("/\\", start); if(slash>start) add_component(p.substr(start, slash-start)); if(slash==string::npos) @@ -191,8 +191,8 @@ void Path::add_component(const string &comp) #endif else { - unsigned slash=path.rfind(DIRSEP); - unsigned start=(slash==string::npos ? 0 : slash+1); + string::size_type slash=path.rfind(DIRSEP); + string::size_type start=(slash==string::npos ? 0 : slash+1); if(!path.compare(start, string::npos, "..")) { // If the last component already is a .., add another diff --git a/source/path.h b/source/path.h index 751c0e3..0b946fd 100644 --- a/source/path.h +++ b/source/path.h @@ -37,7 +37,7 @@ public: private: const Path &path; - unsigned start,end; + std::string::size_type start,end; Iterator(const Path &); public: diff --git a/source/utils.cpp b/source/utils.cpp index abe0d25..22fe1ac 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -47,7 +47,7 @@ string basepart(const string &fn) string extpart(const string &fn) { - unsigned dot=fn.rfind('.'); + string::size_type dot=fn.rfind('.'); if(dot==string::npos) return string(); return fn.substr(dot);