From 8e900f2cda0acd938eb50d8294a0b074761f9a91 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 17 Feb 2022 13:28:44 -0600 Subject: [PATCH] Revert "hb-algs.hh: Fix build on Visual Studio 2015" This reverts commit 52c536bb8d90cf0f09e13f5e9e21bf489cc08c23. See https://github.com/harfbuzz/harfbuzz/pull/3448 --- src/hb-algs.hh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/hb-algs.hh b/src/hb-algs.hh index 23bb42eb2..c40a55cd1 100644 --- a/src/hb-algs.hh +++ b/src/hb-algs.hh @@ -226,14 +226,8 @@ struct template constexpr auto impl (const T& v, hb_priority<2>) const HB_RETURN (uint32_t, hb_deref (v).hash ()) -/* Sadly, we must give further hints to VS2015 to build the following template item */ -#if !defined (_MSC_VER) || defined (__clang__) || (_MSC_VER >= 1910) template constexpr auto impl (const T& v, hb_priority<1>) const HB_RETURN (uint32_t, std::hash>{} (hb_deref (v))) -#else - template constexpr auto - impl (const T& v, hb_priority<1>) const HB_RETURN (uint32_t, std::hash>{} (hb_deref (v))) -#endif template ::value)> constexpr auto