From fe2f8bb2393e496ae3b3a94b3ace10002aacf93e Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 14 Jul 2024 11:54:42 +0800
Subject: [PATCH 1/2] do not put fmt::formatter into fmt namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

as fmt::formatter already has the namespace qualifier. otherwise,
the build would fail when building with fmt 11, like:

```
/usr/include/boxed-cpp/boxed.hpp:218:8: error: extra qualification not allowed [-fpermissive]
  218 | struct fmt::formatter<boxed::detail::boxed<Type, Tag>>
      |        ^~~
In file included from /usr/include/fmt/format.h:41,
                 from /usr/include/boxed-cpp/boxed.hpp:211:
/usr/include/fmt/base.h: In instantiation of ‘static void fmt::v11::detail::value<Context>::format_custom_arg(void*, typename Context::parse_context_type&, Context&) [with T = boxed::detail::boxed<unsigned int, vtpty::detail::tags::Width>; Formatter = fmt::v11::formatter<boxed::detail::boxed<unsigned int, vtpty::detail::tags::Width>, char, void>; Context = fmt::v11::context; typename Context::parse_context_type = fmt::v11::basic_format_parse_context<char>]’:
/usr/include/fmt/base.h:1373:19:   required from ‘constexpr fmt::v11::detail::value<Context>::value(T&) [with T = boxed::detail::boxed<unsigned int, vtpty::detail::tags::Width>; Context = fmt::v11::context]’
 1373 |     custom.format = format_custom_arg<
      |     ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
 1374 |         value_type, typename Context::template formatter_type<value_type>>;
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/fmt/base.h:1631:41:   required from ‘constexpr fmt::v11::detail::format_arg_store<Context, NUM_ARGS, 0, DESC> fmt::v11::make_format_args(T& ...) [with Context = context; T = {boxed::detail::boxed<unsigned int, vtpty::detail::tags::Width>, boxed::detail::boxed<unsigned int, vtpty::detail::tags::Height>}; long unsigned int NUM_ARGS = 2; long unsigned int NUM_NAMED_ARGS = 0; long long unsigned int DESC = 255; typename std::enable_if<(NUM_NAMED_ARGS == 0), int>::type <anonymous> = 0]’
 1631 |   return {arg_mapper<Context>().map(val)};
      |                                         ^
```

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
 include/boxed-cpp/boxed.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/boxed-cpp/boxed.hpp b/include/boxed-cpp/boxed.hpp
index 3986c8b..4d8598c 100644
--- a/include/boxed-cpp/boxed.hpp
+++ b/include/boxed-cpp/boxed.hpp
@@ -212,9 +212,6 @@ struct hash<boxed::detail::boxed<T, U>>
 #include <fmt/format.h>
 // clang-format on
 
-namespace fmt
-{
-
 template <typename Type, typename Tag>
 struct fmt::formatter<boxed::detail::boxed<Type, Tag>>
 {
@@ -226,6 +223,5 @@ struct fmt::formatter<boxed::detail::boxed<Type, Tag>>
     }
 };
 
-} // namespace fmt
 #endif
 // }}}

From e28b094dc811e174b5605d33611b0d638c5ad7ea Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 14 Jul 2024 18:20:55 +0800
Subject: [PATCH 2/2] add make fmt::formatter() const
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

otherwise the tree fails to build:

```
/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<boxed::detail::boxed<unsigned int, vtpty::detail::tags::Width>, char, void>’ as ‘this’ argument discards qualifiers [-fpermissive]
 1392 |     ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
      |                    ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/boxed-cpp/boxed.hpp:219:10: note:   in call to ‘auto fmt::v11::formatter<boxed::detail::boxed<T, Tag> >::format(const boxed::detail::boxed<T, Tag>&, fmt::v11::format_context&) [with Type = unsigned int; Tag = vtpty::detail::tags::Width; fmt::v11::format_context = fmt::v11::context]’
  219 |     auto format(boxed::detail::boxed<Type, Tag> const& val, fmt::format_context& ctx)
      |          ^~~~~~
```

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
 include/boxed-cpp/boxed.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boxed-cpp/boxed.hpp b/include/boxed-cpp/boxed.hpp
index 4d8598c..dfc7e46 100644
--- a/include/boxed-cpp/boxed.hpp
+++ b/include/boxed-cpp/boxed.hpp
@@ -217,7 +217,7 @@ struct fmt::formatter<boxed::detail::boxed<Type, Tag>>
 {
     constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
 
-    auto format(boxed::detail::boxed<Type, Tag> const& val, fmt::format_context& ctx)
+    auto format(boxed::detail::boxed<Type, Tag> const& val, fmt::format_context& ctx) const
     {
         return fmt::format_to(ctx.out(), "{}", val.value);
     }