From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 9 Oct 2020 16:19:06 +0000 (+0200)
Subject: Upgrade to string-view-lite 1.6.0
X-Git-Tag: v4.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab136de99d577f250e12c2f893ed5c470650ef0d;p=thirdparty%2Fccache.git

Upgrade to string-view-lite 1.6.0
---

diff --git a/src/third_party/nonstd/string_view.hpp b/src/third_party/nonstd/string_view.hpp
index 32c7ae144..2784272e7 100644
--- a/src/third_party/nonstd/string_view.hpp
+++ b/src/third_party/nonstd/string_view.hpp
@@ -12,8 +12,8 @@
 #define NONSTD_SV_LITE_H_INCLUDED
 
 #define string_view_lite_MAJOR  1
-#define string_view_lite_MINOR  5
-#define string_view_lite_PATCH  1
+#define string_view_lite_MINOR  6
+#define string_view_lite_PATCH  0
 
 #define string_view_lite_VERSION  nssv_STRINGIFY(string_view_lite_MAJOR) "." nssv_STRINGIFY(string_view_lite_MINOR) "." nssv_STRINGIFY(string_view_lite_PATCH)
 
@@ -26,6 +26,20 @@
 #define nssv_STRING_VIEW_NONSTD   1
 #define nssv_STRING_VIEW_STD      2
 
+// tweak header support:
+
+#ifdef __has_include
+# if __has_include(<nonstd/string_view.tweak.hpp>)
+#  include <nonstd/string_view.tweak.hpp>
+# endif
+#define nssv_HAVE_TWEAK_HEADER  1
+#else
+#define nssv_HAVE_TWEAK_HEADER  0
+//# pragma message("string_view.hpp: Note: Tweak header not supported.")
+#endif
+
+// string_view selection and configuration:
+
 #if !defined( nssv_CONFIG_SELECT_STRING_VIEW )
 # define nssv_CONFIG_SELECT_STRING_VIEW  ( nssv_HAVE_STD_STRING_VIEW ? nssv_STRING_VIEW_STD : nssv_STRING_VIEW_NONSTD )
 #endif
@@ -310,10 +324,10 @@ using std::operator<<;
 // | clang    | 4.0              (>= 4.0   ) | any     (?        ) |
 // | clang-a  | 9.0              (>= 9.0   ) | any     (?        ) |
 // | gcc      | any              (constexpr) | any     (?        ) |
-// | msvc     | >= 14.2          (>= 14.2  ) | any     (?        ) |
+// | msvc     | >= 14.2 C++17    (>= 14.2  ) | any     (?        ) |
 
-#define nssv_HAVE_BUILTIN_VER     ( nssv_COMPILER_MSVC_VERSION >= 142 || nssv_COMPILER_GNUC_VERSION > 0 || nssv_COMPILER_CLANG_VERSION >= 400 || nssv_COMPILER_APPLECLANG_VERSION >= 900 )
-#define nssv_HAVE_BUILTIN_CE        nssv_HAVE_BUILTIN_VER
+#define nssv_HAVE_BUILTIN_VER     ( (nssv_CPP17_000 && nssv_COMPILER_MSVC_VERSION >= 142) || nssv_COMPILER_GNUC_VERSION > 0 || nssv_COMPILER_CLANG_VERSION >= 400 || nssv_COMPILER_APPLECLANG_VERSION >= 900 )
+#define nssv_HAVE_BUILTIN_CE      (  nssv_HAVE_BUILTIN_VER )
 
 #define nssv_HAVE_BUILTIN_MEMCMP  ( (nssv_HAVE_CONSTEXPR_14 && nssv_HAVE_BUILTIN_CE) || !nssv_HAVE_CONSTEXPR_14 )
 #define nssv_HAVE_BUILTIN_STRLEN  ( (nssv_HAVE_CONSTEXPR_11 && nssv_HAVE_BUILTIN_CE) || !nssv_HAVE_CONSTEXPR_11 )