updated fmt implementations to current recommendations

arBmind · arBmind · commit fd4ffe7a3571 · 2023-02-07T16:20:25.000+01:00
diff --git a/src/enum19.lib/enum19/Enum.fmt.h b/src/enum19.lib/enum19/Enum.fmt.h
@@ -5,16 +5,12 @@
 /// noto: for this header you need fmt library (not included as library dependency)
 #include <fmt/format.h>
 
-namespace fmt {
-
-/// adds strong support for fmt
-template<enum19::HasMetaEnum T, class char_type> struct formatter<T, char_type> {
-    constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
+/// adds enum support for fmt
+template<enum19::HasMetaEnum T, class Char> struct fmt::formatter<T, Char> {
+    constexpr auto parse(fmt::basic_format_parse_context<Char>& ctx) { return ctx.begin(); }
 
     template<typename FormatCtx> auto format(const T& v, FormatCtx& ctx) {
         auto underlying = static_cast<std::underlying_type_t<T>>(v);
-        return format_to(ctx.out(), "{} ({})", valueName(v), underlying);
+        return fmt::format_to(ctx.out(), "{} ({})", enum19::valueName(v), underlying);
     }
 };
-
-} // namespace fmt
diff --git a/src/string19.lib/string19/StringView.fmt.h b/src/string19.lib/string19/StringView.fmt.h
@@ -4,17 +4,12 @@
 /// note: for this header you need fmt library (not included as library dependency)
 #include <fmt/format.h>
 
-namespace fmt {
+template<class Char> struct fmt::formatter<string19::StringView, Char> {
+    constexpr auto parse(fmt::basic_format_parse_context<Char>& ctx) { return ctx.begin(); }
 
-/// adds strong support for fmt
-template<class char_type> struct formatter<string19::StringView, char_type> {
-    constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
-
-    template<typename FormatCtx> auto format(const string19::StringView& v, FormatCtx& ctx) {
+    template<typename FormatContext> auto format(const string19::StringView& v, FormatContext& ctx) {
         auto out = ctx.out();
         for (auto i = 0u; i < v.count; i++) *out++ = v[i];
         return out;
     }
 };
-
-} // namespace fmt
diff --git a/src/strong19.lib/strong19/Strong.fmt.h b/src/strong19.lib/strong19/Strong.fmt.h
@@ -5,15 +5,11 @@
 /// noto: for this header you need fmt library (not included as library dependency)
 #include <fmt/format.h>
 
-namespace fmt {
-
 /// adds strong support for fmt
-template<class T, class char_type> requires(strong19::is_strong<T>) struct formatter<T, char_type> {
-    constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
+template<class T, class Char> requires(strong19::is_strong<T>) struct fmt::formatter<T, Char> {
+    constexpr auto parse(fmt::basic_format_parse_context<Char>& ctx) { return ctx.begin(); }
 
-    template<typename FormatCtx> auto format(const T& v, FormatCtx& ctx) {
-        return format_to(ctx.out(), "{} [{}]", v.v, strong19::strong_name<T>);
+    template<typename FormatContext> auto format(const T& v, FormatContext& ctx) {
+        return fmt::format_to(ctx.out(), "{} [{}]", v.v, strong19::strong_name<T>);
     }
 };
-
-} // namespace fmt
