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

Always compile (but not use) alignof() and round() fallback codes 

Catches compile-errors in them better.
This commit is contained in:
Behdad Esfahbod 2018-07-10 13:16:52 +02:00
parent 27c5317d91
commit 292c100d61
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hb-private.hh
View File

@ -78,6 +78,17 @@ extern "C" void hb_free_impl(void *ptr);
/* Compiler attributes */ /* Compiler attributes */
template <typename T>
struct _hb_alignof
{
struct s
{
char c;
T t;
};
static constexpr unsigned int value = offsetof (s, t);
};
#if __cplusplus < 201103L #if __cplusplus < 201103L
#ifndef nullptr #ifndef nullptr
@ -104,16 +115,6 @@ extern "C" void hb_free_impl(void *ptr);
#ifndef alignof #ifndef alignof
#define alignof(x) (_hb_alignof<x>::value) #define alignof(x) (_hb_alignof<x>::value)
template <typename T>
struct _hb_alignof
{
struct s
{
char c;
T t;
};
static constexpr unsigned int value = offsetof (s, t);
};
#endif // alignof #endif // alignof
#endif // __cplusplus < 201103L #endif // __cplusplus < 201103L
@ -1258,7 +1259,6 @@ struct hb_bytes_t
/* fallback for round() */ /* fallback for round() */
#if !defined (HAVE_ROUND) && !defined (HAVE_DECL_ROUND)
static inline double static inline double
_hb_round (double x) _hb_round (double x)
{ {
@ -1267,6 +1267,7 @@ _hb_round (double x)
else else
return ceil (x - 0.5); return ceil (x - 0.5);
} }
#if !defined (HAVE_ROUND) && !defined (HAVE_DECL_ROUND)
#define round(x) _hb_round(x) #define round(x) _hb_round(x)
#endif #endif