mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-02-21 21:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove FMT_HAS_GXX_CXX11

Browse Source
This commit is contained in:
Victor Zverovich 2021-09-03 15:49:40 -07:00
parent 60cd5ea3f2
commit 799bea4730
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/fmt/core.h
View File

@ -32,12 +32,6 @@
# define FMT_GCC_PRAGMA(arg) # define FMT_GCC_PRAGMA(arg)
#endif #endif
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
# define FMT_HAS_GXX_CXX11 FMT_GCC_VERSION
#else
# define FMT_HAS_GXX_CXX11 0
#endif
#if defined(__INTEL_COMPILER) #if defined(__INTEL_COMPILER)
# define FMT_ICC_VERSION __INTEL_COMPILER # define FMT_ICC_VERSION __INTEL_COMPILER
#else #else
@ -124,8 +118,8 @@
#endif #endif
#ifndef FMT_OVERRIDE #ifndef FMT_OVERRIDE
# if FMT_HAS_FEATURE(cxx_override_control) || \ # if FMT_HAS_FEATURE(cxx_override_control) || FMT_GCC_VERSION >= 408 || \
(FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900 FMT_MSC_VER >= 1900
# define FMT_OVERRIDE override # define FMT_OVERRIDE override
# else # else
# define FMT_OVERRIDE # define FMT_OVERRIDE
@ -148,7 +142,7 @@
#endif #endif
#if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \ #if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
(FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900 FMT_GCC_VERSION >= 408 || FMT_MSC_VER >= 1900
# define FMT_DETECTED_NOEXCEPT noexcept # define FMT_DETECTED_NOEXCEPT noexcept
# define FMT_HAS_CXX11_NOEXCEPT 1 # define FMT_HAS_CXX11_NOEXCEPT 1
#else #else
@ -758,11 +752,10 @@ FMT_CONSTEXPR auto copy_str(InputIt begin, InputIt end, OutputIt out)
} }
template <typename Char, typename T, typename U, template <typename Char, typename T, typename U,
FMT_ENABLE_IF(std::is_same<remove_const_t<T>, U>::value && is_char<U>::value)> FMT_ENABLE_IF(
FMT_CONSTEXPR auto copy_str(T* begin, T* end, U* out) std::is_same<remove_const_t<T>, U>::value&& is_char<U>::value)>
-> U* { FMT_CONSTEXPR auto copy_str(T* begin, T* end, U* out) -> U* {
if (is_constant_evaluated()) if (is_constant_evaluated()) return copy_str<Char, T*, U*>(begin, end, out);
return copy_str<Char, T*, U*>(begin, end, out);
auto size = to_unsigned(end - begin); auto size = to_unsigned(end - begin);
memcpy(out, begin, size * sizeof(U)); memcpy(out, begin, size * sizeof(U));
return out + size; return out + size;