fix various GCC function pointer warnings

This commit is contained in:
Simon Tooke 2018-10-30 14:16:23 -04:00 committed by Behdad Esfahbod
parent dc9bd29fea
commit 881e1054bc
2 changed files with 5 additions and 5 deletions

View File

@ -173,7 +173,7 @@ _hb_debug_msg_va (const char *what,
fprintf (stderr, "\n");
}
template <> inline void
template <> inline void HB_PRINTF_FUNC(7, 0)
_hb_debug_msg_va<0> (const char *what HB_UNUSED,
const void *obj HB_UNUSED,
const char *func HB_UNUSED,
@ -192,7 +192,7 @@ _hb_debug_msg (const char *what,
int level_dir,
const char *message,
...) HB_PRINTF_FUNC(7, 8);
template <int max_level> static inline void
template <int max_level> static inline void HB_PRINTF_FUNC(7, 8)
_hb_debug_msg (const char *what,
const void *obj,
const char *func,
@ -216,7 +216,7 @@ _hb_debug_msg<0> (const char *what HB_UNUSED,
int level_dir HB_UNUSED,
const char *message HB_UNUSED,
...) HB_PRINTF_FUNC(7, 8);
template <> inline void
template <> inline void HB_PRINTF_FUNC(7, 8)
_hb_debug_msg<0> (const char *what HB_UNUSED,
const void *obj HB_UNUSED,
const char *func HB_UNUSED,

View File

@ -53,8 +53,8 @@ struct hb_set_t
struct page_t
{
inline void init0 (void) { memset (&v, 0, sizeof (v)); }
inline void init1 (void) { memset (&v, 0xff, sizeof (v)); }
inline void init0 (void) { memset (reinterpret_cast<char*>(&v), 0, sizeof (v)); }
inline void init1 (void) { memset (reinterpret_cast<char*>(&v), 0xff, sizeof (v)); }
inline unsigned int len (void) const
{ return ARRAY_LENGTH_CONST (v); }