From 9e1789ffea47fdeb3133aa42aa9592f3673fb6ed Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 13 Sep 2023 07:57:51 -0700 Subject: Make `HasAbslStringify` public. PiperOrigin-RevId: 565050503 Change-Id: I8f4c463be4ef513a2788745d1b454a7ede489152 --- absl/strings/internal/str_format/arg.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'absl/strings/internal/str_format/arg.h') diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h index 3ce30feb..2e017549 100644 --- a/absl/strings/internal/str_format/arg.h +++ b/absl/strings/internal/str_format/arg.h @@ -31,7 +31,7 @@ #include "absl/base/port.h" #include "absl/meta/type_traits.h" #include "absl/numeric/int128.h" -#include "absl/strings/internal/has_absl_stringify.h" +#include "absl/strings/has_absl_stringify.h" #include "absl/strings/internal/str_format/extension.h" #include "absl/strings/string_view.h" @@ -333,7 +333,7 @@ IntegralConvertResult FormatConvertImpl(T v, FormatConversionSpecImpl conv, template typename std::enable_if::value && !HasUserDefinedConvert::value && - !strings_internal::HasAbslStringify::value, + !HasAbslStringify::value, IntegralConvertResult>::type FormatConvertImpl(T v, FormatConversionSpecImpl conv, FormatSinkImpl* sink); @@ -447,7 +447,7 @@ class FormatArgImpl { struct DecayType { static constexpr bool kHasUserDefined = str_format_internal::HasUserDefinedConvert::value || - strings_internal::HasAbslStringify::value; + HasAbslStringify::value; using type = typename std::conditional< !kHasUserDefined && std::is_convertible::value, const char*, @@ -456,11 +456,10 @@ class FormatArgImpl { VoidPtr, const T&>::type>::type; }; template - struct DecayType::value && - !strings_internal::HasAbslStringify::value && - std::is_enum::value>::type> { + struct DecayType< + T, typename std::enable_if< + !str_format_internal::HasUserDefinedConvert::value && + !HasAbslStringify::value && std::is_enum::value>::type> { using type = decltype(+typename std::underlying_type::type()); }; -- cgit v1.2.3