X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fvendor%2Ffmt%2Fargs.h;h=a3966d1407198da8f3058b086ed403addb556b2e;hb=8b75cd779ffe332281fec189cdf808e4ee452572;hp=9a8e4ed2cebb84c65b32633fcf82eb7cc6f92990;hpb=dc65dda314fcd676fabfe73942c34cb93b7fea40;p=lttng-tools.git

diff --git a/src/vendor/fmt/args.h b/src/vendor/fmt/args.h
index 9a8e4ed2c..a3966d140 100644
--- a/src/vendor/fmt/args.h
+++ b/src/vendor/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_;