salmon-engine-core/engine
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++11 fixing

Browse Source
This commit is contained in:
Vladislav Khorev 2013-11-23 20:11:53 +00:00
parent db9f155e93
commit 3493fc9d63
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/Utils/FileUtils/FileUtils.h
View File

@ -59,9 +59,9 @@ inline char* GetFileName(const char* filename)
inline std::string GetFileName(const std::string& filename) inline std::string GetFileName(const std::string& filename)
{ {
std::string::const_iterator i = filename.cend() - 1; std::string::const_iterator i = filename.end() - 1;
while ((i > filename.cbegin() )&&(*i != '\\')&&(*i != '/')) while ((i > filename.begin() )&&(*i != '\\')&&(*i != '/'))
--i; --i;
if (*i == '\\' || *i == '/') if (*i == '\\' || *i == '/')
@ -69,7 +69,7 @@ inline std::string GetFileName(const std::string& filename)
i++; i++;
} }
return std::string(i, filename.cend()); return std::string(i, filename.end());
} }
//utitily to process texture uploading //utitily to process texture uploading
@ -85,12 +85,12 @@ inline char* GetFileExt(const char* filename)
inline std::string GetFileExt(const std::string& filename) inline std::string GetFileExt(const std::string& filename)
{ {
std::string::const_iterator i = filename.cend() - 1; std::string::const_iterator i = filename.end() - 1;
while (*i != '.') while (*i != '.')
--i; --i;
return std::string(i, filename.cend()); return std::string(i, filename.end());
} }
@ -98,12 +98,12 @@ inline std::string GetFileNameWithoutExt(const std::string& filename)
{ {
std::string result = GetFileName(filename); std::string result = GetFileName(filename);
std::string::const_iterator i = result.cend() - 1; std::string::const_iterator i = result.end() - 1;
while (*i != '.') while (*i != '.')
--i; --i;
return std::string(result.cbegin(), i); return std::string(result.begin(), i);
} }
std::string GetFilePath(const std::string& filename); std::string GetFilePath(const std::string& filename);