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

Simplify HB_PARTIALIZE impl 

+this works on gcc 4.8 as well as default code path.
This commit is contained in:
Behdad Esfahbod 2019-06-10 12:48:25 -07:00
parent 451edbd4d0
commit ff9b9b1c89
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hb-algs.hh
View File

@ -181,10 +181,9 @@ auto hb_partial (Appl&& a, V&& v) HB_AUTO_RETURN
* *
* In the case of MSVC, we get around this by using C++14 "decltype(auto)" * In the case of MSVC, we get around this by using C++14 "decltype(auto)"
* which deduces the type from the actual return statement. For gcc 4.8 * which deduces the type from the actual return statement. For gcc 4.8
* we use "this+0" instead of "this" which produces an rvalue that seems * we use "+this" instead of "this" which produces an rvalue that seems
* to do be deduces as the same type with this particular compiler. Note * to be deduced as the same type with this particular compiler, and seem
* that "this+0" is illegal in the trailing decltype position since at * to be fine as default code path as well.
* that point this points to incomplete type! But seems to do the trick.
*/ */
#ifdef _MSC_VER #ifdef _MSC_VER
/* https://github.com/harfbuzz/harfbuzz/issues/1730 */ \ /* https://github.com/harfbuzz/harfbuzz/issues/1730 */ \
@ -193,18 +192,12 @@ auto hb_partial (Appl&& a, V&& v) HB_AUTO_RETURN
decltype(auto) operator () (_T&& _v) const \ decltype(auto) operator () (_T&& _v) const \
{ return hb_partial<Pos> (this, hb_forward<_T> (_v)); } \ { return hb_partial<Pos> (this, hb_forward<_T> (_v)); } \
static_assert (true, "") static_assert (true, "")
#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ <= 8) #else
/* https://github.com/harfbuzz/harfbuzz/issues/1724 */ /* 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+0, hb_forward<_T> (_v))) \ (hb_partial<Pos> (+this, hb_forward<_T> (_v))) \
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, "") static_assert (true, "")
#endif #endif