From a0c4900799c26e4ff34180842a5ff21048fe31a0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 10 Jun 2019 12:33:23 -0700 Subject: [PATCH] Test new solution for HB_PARTIALIZE Just testing bots. Will finish based on results. --- src/hb-algs.hh | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/hb-algs.hh b/src/hb-algs.hh index 7b727f299..401668a36 100644 --- a/src/hb-algs.hh +++ b/src/hb-algs.hh @@ -186,27 +186,11 @@ auto hb_partial (Appl&& a, V&& v) HB_AUTO_RETURN * that "this+0" is illegal in the trailing decltype position since at * that point this points to incomplete type! But seems to do the trick. */ -#ifdef _MSC_VER -/* https://github.com/harfbuzz/harfbuzz/issues/1730 */ \ -#define HB_PARTIALIZE(Pos) \ - template \ - decltype(auto) operator () (_T&& _v) const \ - { return hb_partial (this, hb_forward<_T> (_v)); } \ - static_assert (true, "") -#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ <= 8) -/* https://github.com/harfbuzz/harfbuzz/issues/1724 */ #define HB_PARTIALIZE(Pos) \ template \ auto operator () (_T&& _v) const HB_AUTO_RETURN \ - (hb_partial (this+0, hb_forward<_T> (_v))) \ + (hb_partial (+this, hb_forward<_T> (_v))) \ static_assert (true, "") -#else -#define HB_PARTIALIZE(Pos) \ - template \ - auto operator () (_T&& _v) const HB_AUTO_RETURN \ - (hb_partial (this, hb_forward<_T> (_v))) \ - static_assert (true, "") -#endif struct