update ceph source to reef 18.1.2

[ceph.git] / ceph / src / fmt / include / fmt / args.h

diff --git a/ceph/src/fmt/include/fmt/args.h b/ceph/src/fmt/include/fmt/args.h
index 562e8ab1118514d8670464980a87863c021f330e..a3966d1407198da8f3058b086ed403addb556b2e 100644 (file)
--- a/ceph/src/fmt/include/fmt/args.h
+++ b/ceph/src/fmt/include/fmt/args.h
@@ -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_;
@@ -143,6 +143,8 @@ class dynamic_format_arg_store
   }
 
  public:
+  constexpr dynamic_format_arg_store() = default;
+
   /**
     \rst
     Adds an argument into the dynamic store for later passing to a formatting