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:03:15 +00:00
parent 94e073eaaa
commit db9f155e93
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.end() - 1; std::string::const_iterator i = filename.cend() - 1;
while ((i > filename.begin() )&&(*i != '\\')&&(*i != '/')) while ((i > filename.cbegin() )&&(*i != '\\')&&(*i != '/'))
--i; --i;
if (*i == '\\' || *i == '/') if (*i == '\\' || *i == '/')
@ -85,7 +85,7 @@ 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.end() - 1; std::string::const_iterator i = filename.cend() - 1;
while (*i != '.') while (*i != '.')
--i; --i;
@ -98,7 +98,7 @@ inline std::string GetFileNameWithoutExt(const std::string& filename)
{ {
std::string result = GetFileName(filename); std::string result = GetFileName(filename);
std::string::const_iterator i = result.end() - 1; std::string::const_iterator i = result.cend() - 1;
while (*i != '.') while (*i != '.')
--i; --i;