External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove this-> from decltype (#3723)

Browse Source 
* Remove this-> from decltype

The latest version of MSVC doesn't like it, and removing it doesn't seem to harm anything.

* Add ifdef for GCC < 5
This commit is contained in:
Peter Johnson 2023-11-22 09:46:04 -08:00 committed by GitHub
parent c13753a70c
commit dd6f657a79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/fmt/core.h
View File

@ -244,6 +244,15 @@
# endif # endif
#endif #endif
// GCC < 5 requires this-> in decltype
#ifndef FMT_DECLTYPE_THIS
# if FMT_GCC_VERSION && FMT_GCC_VERSION < 500
# define FMT_DECLTYPE_THIS this->
# else
# define FMT_DECLTYPE_THIS
# endif
#endif
// Enable minimal optimizations for more compact code in debug mode. // Enable minimal optimizations for more compact code in debug mode.
FMT_GCC_PRAGMA("GCC push_options") FMT_GCC_PRAGMA("GCC push_options")
#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) && \ #if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) && \
@ -1439,7 +1448,7 @@ template <typename Context> struct arg_mapper {
// Only map owning types because mapping views can be unsafe. // Only map owning types because mapping views can be unsafe.
template <typename T, typename U = format_as_t<T>, template <typename T, typename U = format_as_t<T>,
FMT_ENABLE_IF(std::is_arithmetic<U>::value)> FMT_ENABLE_IF(std::is_arithmetic<U>::value)>
FMT_CONSTEXPR FMT_INLINE auto map(const T& val) -> decltype(this->map(U())) { FMT_CONSTEXPR FMT_INLINE auto map(const T& val) -> decltype(FMT_DECLTYPE_THIS map(U())) {
return map(format_as(val)); return map(format_as(val));
} }
@ -1463,13 +1472,13 @@ template <typename Context> struct arg_mapper {
!is_string<U>::value && !is_char<U>::value && !is_string<U>::value && !is_char<U>::value &&
!is_named_arg<U>::value && !is_named_arg<U>::value &&
!std::is_arithmetic<format_as_t<U>>::value)> !std::is_arithmetic<format_as_t<U>>::value)>
FMT_CONSTEXPR FMT_INLINE auto map(T& val) -> decltype(this->do_map(val)) { FMT_CONSTEXPR FMT_INLINE auto map(T& val) -> decltype(FMT_DECLTYPE_THIS do_map(val)) {
return do_map(val); return do_map(val);
} }
template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)> template <typename T, FMT_ENABLE_IF(is_named_arg<T>::value)>
FMT_CONSTEXPR FMT_INLINE auto map(const T& named_arg) FMT_CONSTEXPR FMT_INLINE auto map(const T& named_arg)
-> decltype(this->map(named_arg.value)) { -> decltype(FMT_DECLTYPE_THIS map(named_arg.value)) {
return map(named_arg.value); return map(named_arg.value);
} }