diff options
author | 2022-07-31 02:31:40 +1000 | |
---|---|---|
committer | 2022-07-31 02:31:40 +1000 | |
commit | e98145d9d8e6cec0c98883d5b5c887fd21d01d27 (patch) | |
tree | fe45babea2ad0118014e6b0a326d163d4f528016 /src/lib/util/corestr.h | |
parent | 1bf2cc0cf347aa65d1dc0021dd8c7317b14a49cf (diff) |
Various minor cleanups.
There's something wrong when derived classes need to be friends...
Diffstat (limited to 'src/lib/util/corestr.h')
-rw-r--r-- | src/lib/util/corestr.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/lib/util/corestr.h b/src/lib/util/corestr.h index 8caf014509b..d5b79ddb5fa 100644 --- a/src/lib/util/corestr.h +++ b/src/lib/util/corestr.h @@ -53,23 +53,17 @@ int core_strwildcmp(const char *sp1, const char *sp2); bool core_iswildstr(const char *sp); /* trim functions */ -template<typename TPred> -std::string_view strtrimleft(std::string_view str, TPred pred) +template <typename TPred> +std::string_view strtrimleft(std::string_view str, TPred &&pred) { - std::string_view::iterator start = std::find_if( - str.begin(), - str.end(), - pred); - return str.substr(start - str.begin(), str.end() - start); + auto const start = std::find_if(str.begin(), str.end(), pred); + return str.substr(start - str.begin()); } -template<typename TPred> -std::string_view strtrimright(std::string_view str, TPred pred) +template <typename TPred> +std::string_view strtrimright(std::string_view str, TPred &&pred) { - std::string_view::reverse_iterator end = std::find_if( - str.rbegin(), - str.rend(), - pred); + auto const end = std::find_if(str.rbegin(), str.rend(), pred); return str.substr(0, str.size() - (end - str.rbegin())); } |