commit 5186b5fb1abaaed6696e077fb5fd7e0a07ed707d
author Peter Foley <pefoley@google.com> Tue Oct 31 17:03:09 2023 -0400
committer Peter Foley <pefoley@google.com> Mon Nov 06 15:41:07 2023 +0000
tree 55a122d8529519663329d01a2577022b8a02f7fd
parent 6679ebdb8bd38139d006a14ac782841f276ebf96

include: Improve libc++ compat

Avoid ambiguous name lookup errors when building with libc++

Change-Id: I032a75777950659471c64bf294b555049131da8d
Signed-off-by: Peter Foley <pefoley@google.com>

include/stdplus/zstring.hpp

diff --git a/include/stdplus/zstring.hpp b/include/stdplus/zstring.hpp
index d36b4dc..a7cd8c6 100644
--- a/include/stdplus/zstring.hpp
+++ b/include/stdplus/zstring.hpp
@@ -2,6 +2,7 @@
 #include <fmt/core.h>
 
 #include <cstddef>
+#include <format>
 #include <limits>
 #include <string>
 #include <type_traits>
@@ -266,9 +267,6 @@
 
 namespace std
 {
-template <typename T, typename CharT>
-struct formatter;
-
 template <typename CharT, typename Traits>
 struct formatter<stdplus::basic_zstring<CharT, Traits>,
                  std::remove_const_t<CharT>> :

include/stdplus/zstring_view.hpp

diff --git a/include/stdplus/zstring_view.hpp b/include/stdplus/zstring_view.hpp
index e1d180f..1a478cb 100644
--- a/include/stdplus/zstring_view.hpp
+++ b/include/stdplus/zstring_view.hpp
@@ -371,9 +371,6 @@
 
 namespace std
 {
-template <typename T, typename CharT>
-struct formatter;
-
 template <typename CharT, typename Traits>
 struct formatter<stdplus::basic_zstring_view<CharT, Traits>, CharT> :
     formatter<basic_string_view<CharT>, CharT>