walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Test new solution for HB_PARTIALIZE" 

This reverts commit a0c4900799.
This commit is contained in:
Behdad Esfahbod 2019-06-10 12:46:54 -07:00
parent a0c4900799
commit 451edbd4d0
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-algs.hh
View File

@ -186,11 +186,27 @@ auto hb_partial (Appl&& a, V&& v) HB_AUTO_RETURN
* that "this+0" is illegal in the trailing decltype position since at * 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. * 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 <typename _T> \
decltype(auto) operator () (_T&& _v) const \
{ return hb_partial<Pos> (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) \ #define HB_PARTIALIZE(Pos) \
template <typename _T> \ template <typename _T> \
auto operator () (_T&& _v) const HB_AUTO_RETURN \ auto operator () (_T&& _v) const HB_AUTO_RETURN \
(hb_partial<Pos> (+this, hb_forward<_T> (_v))) \ (hb_partial<Pos> (this+0, hb_forward<_T> (_v))) \
static_assert (true, "") static_assert (true, "")
#else
#define HB_PARTIALIZE(Pos) \
template <typename _T> \
auto operator () (_T&& _v) const HB_AUTO_RETURN \
(hb_partial<Pos> (this, hb_forward<_T> (_v))) \
static_assert (true, "")
#endif
struct struct