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

[algs] Another try at fixing BEInt constexpr

Browse Source 
../src/hb-algs.hh:120:3: error: body of constexpr function ‘constexpr BEInt<Type, 2>::operator Type() const [with Type = short unsigned int]’ not a return-statement
This commit is contained in:
Behdad Esfahbod 2021-02-20 15:42:44 -07:00
parent ff7bf88192
commit 69464e9da0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-algs.hh
View File

@ -100,6 +100,8 @@ struct BEInt<Type, 2>
BEInt () = default; BEInt () = default;
constexpr BEInt (Type V) : v {uint8_t ((V >> 8) & 0xFF), constexpr BEInt (Type V) : v {uint8_t ((V >> 8) & 0xFF),
uint8_t ((V ) & 0xFF)} {} uint8_t ((V ) & 0xFF)} {}
struct __attribute__((packed)) packed_uint16_t { uint16_t v; };
constexpr operator Type () const constexpr operator Type () const
{ {
#if ((defined(__GNUC__) && __GNUC__ >= 5) || defined(__clang__)) && \ #if ((defined(__GNUC__) && __GNUC__ >= 5) || defined(__clang__)) && \
@ -107,7 +109,6 @@ struct BEInt<Type, 2>
(__BYTE_ORDER == __LITTLE_ENDIAN || __BYTE_ORDER == __BIG_ENDIAN) (__BYTE_ORDER == __LITTLE_ENDIAN || __BYTE_ORDER == __BIG_ENDIAN)
/* Spoon-feed the compiler a big-endian integer with alignment 1. /* Spoon-feed the compiler a big-endian integer with alignment 1.
* https://github.com/harfbuzz/harfbuzz/pull/1398 */ * https://github.com/harfbuzz/harfbuzz/pull/1398 */
struct __attribute__((packed)) packed_uint16_t { uint16_t v; };
#if __BYTE_ORDER == __LITTLE_ENDIAN #if __BYTE_ORDER == __LITTLE_ENDIAN
return __builtin_bswap16 (((packed_uint16_t *) this)->v); return __builtin_bswap16 (((packed_uint16_t *) this)->v);
#else /* __BYTE_ORDER == __BIG_ENDIAN */ #else /* __BYTE_ORDER == __BIG_ENDIAN */