From b1175acb59b4f0d9f01692f1e9b8b96ffc5c7ddf Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 22 Jul 2021 13:37:35 +0200 Subject: [PATCH] util/StringView: hard-code C++17 --- src/util/StringView.hxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/util/StringView.hxx b/src/util/StringView.hxx index 9c594d767..a26fe9aee 100644 --- a/src/util/StringView.hxx +++ b/src/util/StringView.hxx @@ -32,14 +32,10 @@ #include "ConstBuffer.hxx" #include "StringAPI.hxx" -#include "Compiler.h" -#include #include - -#if __cplusplus >= 201703L && !GCC_OLDER_THAN(7,0) #include -#endif +#include template struct BasicStringView : ConstBuffer { @@ -72,14 +68,12 @@ struct BasicStringView : ConstBuffer { constexpr BasicStringView(std::nullptr_t n) noexcept :ConstBuffer(n) {} -#if __cplusplus >= 201703L && !GCC_OLDER_THAN(7,0) constexpr BasicStringView(std::basic_string_view src) noexcept :ConstBuffer(src.data(), src.size()) {} constexpr operator std::basic_string_view() const noexcept { return {data, size}; } -#endif using ConstBuffer::empty; using ConstBuffer::begin;