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

Remove redundant detection of experimental string_view

Browse Source
This commit is contained in:
Victor Zverovich
2024-01-12 07:45:07 -08:00
parent 0cdee904a4
commit 3c9608416a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/fmt/format.h
View File

@ -59,9 +59,6 @@
(FMT_CPLUSPLUS >= 201703L || defined(_LIBCPP_VERSION)) (FMT_CPLUSPLUS >= 201703L || defined(_LIBCPP_VERSION))
# include <string_view> # include <string_view>
# define FMT_USE_STRING_VIEW # define FMT_USE_STRING_VIEW
#elif FMT_HAS_INCLUDE("experimental/string_view") && FMT_CPLUSPLUS >= 201402L
# include <experimental/string_view>
# define FMT_USE_EXPERIMENTAL_STRING_VIEW
#endif #endif
#if defined __cpp_inline_variables && __cpp_inline_variables >= 201606L #if defined __cpp_inline_variables && __cpp_inline_variables >= 201606L
@ -287,9 +284,6 @@ FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
#if defined(FMT_USE_STRING_VIEW) #if defined(FMT_USE_STRING_VIEW)
template <typename Char> using std_string_view = std::basic_string_view<Char>; template <typename Char> using std_string_view = std::basic_string_view<Char>;
#elif defined(FMT_USE_EXPERIMENTAL_STRING_VIEW)
template <typename Char>
using std_string_view = std::experimental::basic_string_view<Char>;
#else #else
template <typename T> struct std_string_view {}; template <typename T> struct std_string_view {};
#endif #endif
@ -1054,9 +1048,9 @@ constexpr auto compile_string_to_view(const Char (&s)[N])
return {s, N - (std::char_traits<Char>::to_int_type(s[N - 1]) == 0 ? 1 : 0)}; return {s, N - (std::char_traits<Char>::to_int_type(s[N - 1]) == 0 ? 1 : 0)};
} }
template <typename Char> template <typename Char>
constexpr auto compile_string_to_view(detail::std_string_view<Char> s) constexpr auto compile_string_to_view(basic_string_view<Char> s)
-> basic_string_view<Char> { -> basic_string_view<Char> {
return {s.data(), s.size()}; return s;
} }
} // namespace detail_exported } // namespace detail_exported