From e208f80449caccea19f68e395ad4c38353849da6 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 20 Feb 2021 15:31:27 -0700 Subject: [PATCH] Make constexpr BEInt::operator Type() C++11-compatible Multiple return values not permitted until C++14 --- src/hb-algs.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hb-algs.hh b/src/hb-algs.hh index 52e64aed6..ccb293d60 100644 --- a/src/hb-algs.hh +++ b/src/hb-algs.hh @@ -113,9 +113,10 @@ struct BEInt #else /* __BYTE_ORDER == __BIG_ENDIAN */ return ((packed_uint16_t *) this)->v; #endif -#endif +#else return (v[0] << 8) + (v[1] ); +#endif } private: uint8_t v[2]; };