Revert "removing redundant function modifiers"
This reverts commit 39536dbb93
.
This commit is contained in:
Родитель
9b2a980cbc
Коммит
e944487f45
|
@ -49,23 +49,23 @@ struct MatchPathSeparator
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
std::string basename(std::string const &pathname)
|
inline std::string basename(std::string const &pathname)
|
||||||
{
|
{
|
||||||
return std::string(std::find_if(pathname.rbegin(), pathname.rend(), MatchPathSeparator()).base(), pathname.end());
|
return std::string(std::find_if(pathname.rbegin(), pathname.rend(), MatchPathSeparator()).base(), pathname.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::wstring basename(std::wstring const &pathname)
|
static inline std::wstring basename(std::wstring const &pathname)
|
||||||
{
|
{
|
||||||
return std::wstring(std::find_if(pathname.rbegin(), pathname.rend(), MatchPathSeparator()).base(), pathname.end());
|
return std::wstring(std::find_if(pathname.rbegin(), pathname.rend(), MatchPathSeparator()).base(), pathname.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string removeExtension(std::string const &filename)
|
inline std::string removeExtension(std::string const &filename)
|
||||||
{
|
{
|
||||||
size_t lastindex = filename.find_first_of(".");
|
size_t lastindex = filename.find_first_of(".");
|
||||||
return filename.substr(0, lastindex);
|
return filename.substr(0, lastindex);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::wstring removeExtension(std::wstring const &filename)
|
inline std::wstring removeExtension(std::wstring const &filename)
|
||||||
{
|
{
|
||||||
size_t lastindex = filename.find_first_of(L".");
|
size_t lastindex = filename.find_first_of(L".");
|
||||||
return filename.substr(0, lastindex);
|
return filename.substr(0, lastindex);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче