diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2023-09-07 13:16:09 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2023-09-07 13:16:09 -0400 |
| commit | 6fdbff8bbce2a1debdc060df381f39e3dcfb65af (patch) | |
| tree | 71f1ef38477a65d5cce472fc042c90087c2bb351 /absl/strings/internal/str_format/arg.h | |
| parent | 8d4a80fe37176b1170d7dce0772dea9584ec3e32 (diff) | |
| parent | 29bf8085f3bf17b84d30e34b3d7ff8248fda404e (diff) | |
Merge new upstream LTS 20230802.0
Diffstat (limited to 'absl/strings/internal/str_format/arg.h')
| -rw-r--r-- | absl/strings/internal/str_format/arg.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h index e4b16628..3ce30feb 100644 --- a/absl/strings/internal/str_format/arg.h +++ b/absl/strings/internal/str_format/arg.h @@ -279,14 +279,14 @@ FloatingConvertResult FormatConvertImpl(long double v, // Chars. CharConvertResult FormatConvertImpl(char v, FormatConversionSpecImpl conv, FormatSinkImpl* sink); -CharConvertResult FormatConvertImpl(signed char v, - FormatConversionSpecImpl conv, - FormatSinkImpl* sink); -CharConvertResult FormatConvertImpl(unsigned char v, - FormatConversionSpecImpl conv, - FormatSinkImpl* sink); // Ints. +IntegralConvertResult FormatConvertImpl(signed char v, + FormatConversionSpecImpl conv, + FormatSinkImpl* sink); +IntegralConvertResult FormatConvertImpl(unsigned char v, + FormatConversionSpecImpl conv, + FormatSinkImpl* sink); IntegralConvertResult FormatConvertImpl(short v, // NOLINT FormatConversionSpecImpl conv, FormatSinkImpl* sink); @@ -441,7 +441,7 @@ class FormatArgImpl { // For everything else: // - Decay char* and char arrays into `const char*` // - Decay any other pointer to `const void*` - // - Decay all enums to their underlying type. + // - Decay all enums to the integral promotion of their underlying type. // - Decay function pointers to void*. template <typename T, typename = void> struct DecayType { @@ -461,7 +461,7 @@ class FormatArgImpl { !str_format_internal::HasUserDefinedConvert<T>::value && !strings_internal::HasAbslStringify<T>::value && std::is_enum<T>::value>::type> { - using type = typename std::underlying_type<T>::type; + using type = decltype(+typename std::underlying_type<T>::type()); }; public: |