From f2d92931ce137e73c8bd3e7c180634dbdb49e3ea Mon Sep 17 00:00:00 2001
From: Dair Grant <dair@refnum.com>
Date: Sat, 7 Mar 2020 01:46:25 +0000
Subject: [PATCH] Adjust FMT_STRING_RESULT check to gcc 8.4.

---
 include/fmt/compile.h | 9 +--------
 include/fmt/format.h  | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/include/fmt/compile.h b/include/fmt/compile.h
index 0bb8cb5a..e4b12f34 100644
--- a/include/fmt/compile.h
+++ b/include/fmt/compile.h
@@ -542,7 +542,7 @@ constexpr auto compile(S format_str) -> internal::compiled_format<S, Args...> {
 #  endif  // __cpp_if_constexpr
 #endif    // FMT_USE_CONSTEXPR
 
-// Compiles the format string which must be a string literal or view.
+// Compiles the format string which must be a string literal.
 template <typename... Args, typename Char, size_t N>
 auto compile(const Char (&format_str)[N])
     -> internal::compiled_format<const Char*, Args...> {
@@ -550,13 +550,6 @@ auto compile(const Char (&format_str)[N])
       basic_string_view<Char>(format_str, N - 1));
 }
 
-template <typename Char>
-auto compile(const basic_string_view<Char>& format_str)
-    -> internal::compiled_format<const Char*> {
-  return internal::compiled_format<const Char*>(
-      format_str);
-}
-
 template <typename CompiledFormat, typename... Args,
           typename Char = typename CompiledFormat::char_type,
           FMT_ENABLE_IF(std::is_base_of<internal::basic_compiled_format,
diff --git a/include/fmt/format.h b/include/fmt/format.h
index d112ecdc..081ee7b5 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -3544,7 +3544,7 @@ FMT_CONSTEXPR internal::udl_arg<wchar_t> operator"" _a(const wchar_t* s,
 #endif  // FMT_USE_USER_DEFINED_LITERALS
 FMT_END_NAMESPACE
 
-#if FMT_GCC_VERSION >= 800
+#if FMT_GCC_VERSION >= 840
 #  define FMT_STRING_RESULT(s)   ()->fmt::basic_string_view<fmt::remove_cvref_t<decltype(*s)>>
 #else
 #  define FMT_STRING_RESULT(s)