From e944487f4541d10ca289c7bd494394bf0c743d45 Mon Sep 17 00:00:00 2001 From: Adalberto Foresti Date: Sat, 1 Oct 2016 18:08:03 -0700 Subject: [PATCH] Revert "removing redundant function modifiers" This reverts commit 39536dbb93cf69e91464574ea0a01a7b331ffb58. --- Source/Readers/Kaldi2Reader/htkfeatio_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Readers/Kaldi2Reader/htkfeatio_utils.h b/Source/Readers/Kaldi2Reader/htkfeatio_utils.h index 9ac39b784..b872a82ba 100644 --- a/Source/Readers/Kaldi2Reader/htkfeatio_utils.h +++ b/Source/Readers/Kaldi2Reader/htkfeatio_utils.h @@ -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()); } -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()); } -std::string removeExtension(std::string const &filename) +inline std::string removeExtension(std::string const &filename) { size_t lastindex = filename.find_first_of("."); 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"."); return filename.substr(0, lastindex);