diff options
Diffstat (limited to 'Source/cmString.hxx')
| -rw-r--r-- | Source/cmString.hxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Source/cmString.hxx b/Source/cmString.hxx index 49bad78..073f4c9 100644 --- a/Source/cmString.hxx +++ b/Source/cmString.hxx @@ -5,10 +5,8 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_static_string_view.hxx" -#include "cm_string_view.hxx" - #include <algorithm> +#include <cstddef> #include <functional> #include <initializer_list> #include <memory> @@ -17,6 +15,10 @@ #include <type_traits> #include <utility> +#include <cm/string_view> + +#include "cm_static_string_view.hxx" + namespace cm { class String; @@ -713,7 +715,7 @@ template <typename T> struct StringAdd { static const bool value = AsStringView<T>::value; - typedef string_view temp_type; + using temp_type = string_view; template <typename S> static temp_type temp(S&& s) { @@ -724,7 +726,7 @@ struct StringAdd template <typename L, typename R> struct StringAdd<StringOpPlus<L, R>> : std::true_type { - typedef StringOpPlus<L, R> const& temp_type; + using temp_type = StringOpPlus<L, R> const&; static temp_type temp(temp_type s) { return s; } }; @@ -801,8 +803,8 @@ namespace std { template <> struct hash<cm::String> { - typedef cm::String argument_type; - typedef size_t result_type; + using argument_type = cm::String; + using result_type = size_t; result_type operator()(argument_type const& s) const noexcept { |