Fix compilation with gcc

james-d-mitchell · Oct 11, 2023 · 90b287f · 90b287f
1 parent cb42009
commit 90b287f
Show file tree

Hide file tree

Showing 24 changed files with 9,612 additions and 9,059 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -171,19 +171,18 @@ endif ## LIBSEMIGROUPS_HPCOMBI_ENABLED
 ## uninstall-hook
 fmtincludedir = $(includedir)/libsemigroups/fmt
 if LIBSEMIGROUPS_WITH_INTERNAL_FMT
-fmtinclude_HEADERS =  extern/fmt-8.1.1/include/fmt/args.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/chrono.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/color.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/compile.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/core.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/format-inl.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/format.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/locale.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/os.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/ostream.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/printf.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/ranges.h
-fmtinclude_HEADERS += extern/fmt-8.1.1/include/fmt/xchar.h
+fmtinclude_HEADERS =  extern/fmt-10.1.1/include/fmt/args.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/chrono.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/color.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/compile.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/core.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/format-inl.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/format.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/os.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/ostream.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/printf.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/ranges.h
+fmtinclude_HEADERS += extern/fmt-10.1.1/include/fmt/xchar.h
 endif
 
 ## Define eigenincludedir outside the conditional

diff --git a/extern/fmt-8.1.1/include/fmt/args.h → extern/fmt-10.1.1/include/fmt/args.h b/extern/fmt-8.1.1/include/fmt/args.h → extern/fmt-10.1.1/include/fmt/args.h
@@ -1,4 +1,4 @@
-// Formatting library for C++ - dynamic format arguments
+// Formatting library for C++ - dynamic argument lists
 //
 // Copyright (c) 2012 - present, Victor Zverovich
 // All rights reserved.
@@ -95,10 +95,10 @@ class dynamic_format_arg_store
   };
 
   template <typename T>
-  using stored_type = conditional_t<detail::is_string<T>::value &&
-                                        !has_formatter<T, Context>::value &&
-                                        !detail::is_reference_wrapper<T>::value,
-                                    std::basic_string<char_type>, T>;
+  using stored_type = conditional_t<
+      std::is_convertible<T, std::basic_string<char_type>>::value &&
+          !detail::is_reference_wrapper<T>::value,
+      std::basic_string<char_type>, T>;
 
   // Storage of basic_format_arg must be contiguous.
   std::vector<basic_format_arg<Context>> data_;