Fix build on clang after previous commit
This commit is contained in:
parent
a5a27073cf
commit
9c80cbc87f
|
@ -106,7 +106,8 @@ struct hb_object_header_t
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
template <typename Type> friend Type *hb_object_create (void);
|
template <typename Type> friend
|
||||||
|
static inline Type *hb_object_create (void);
|
||||||
static inline void *create (unsigned int size) {
|
static inline void *create (unsigned int size) {
|
||||||
hb_object_header_t *obj = (hb_object_header_t *) calloc (1, size);
|
hb_object_header_t *obj = (hb_object_header_t *) calloc (1, size);
|
||||||
|
|
||||||
|
@ -116,23 +117,27 @@ struct hb_object_header_t
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Type> friend void hb_object_init (Type *obj);
|
template <typename Type> friend
|
||||||
|
static inline void hb_object_init (Type *obj);
|
||||||
inline void init (void) {
|
inline void init (void) {
|
||||||
ref_count.init (1);
|
ref_count.init (1);
|
||||||
user_data.init ();
|
user_data.init ();
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Type> friend bool hb_object_is_inert (const Type *obj);
|
template <typename Type> friend
|
||||||
|
static inline bool hb_object_is_inert (const Type *obj);
|
||||||
inline bool is_inert (void) const {
|
inline bool is_inert (void) const {
|
||||||
return unlikely (ref_count.is_invalid ());
|
return unlikely (ref_count.is_invalid ());
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Type> friend Type *hb_object_reference (Type *obj);
|
template <typename Type> friend
|
||||||
|
static inline Type *hb_object_reference (Type *obj);
|
||||||
inline void reference (void) {
|
inline void reference (void) {
|
||||||
ref_count.inc ();
|
ref_count.inc ();
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Type> friend bool hb_object_destroy (Type *obj);
|
template <typename Type> friend
|
||||||
|
static inline bool hb_object_destroy (Type *obj);
|
||||||
inline bool destroy (void) {
|
inline bool destroy (void) {
|
||||||
if (ref_count.dec () != 1)
|
if (ref_count.dec () != 1)
|
||||||
return false;
|
return false;
|
||||||
|
@ -143,11 +148,12 @@ struct hb_object_header_t
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Type> friend bool hb_object_set_user_data (Type *obj,
|
template <typename Type> friend
|
||||||
hb_user_data_key_t *key,
|
static inline bool hb_object_set_user_data (Type *obj,
|
||||||
void * data,
|
hb_user_data_key_t *key,
|
||||||
hb_destroy_func_t destroy,
|
void * data,
|
||||||
hb_bool_t replace);
|
hb_destroy_func_t destroy,
|
||||||
|
hb_bool_t replace);
|
||||||
inline bool set_user_data (hb_user_data_key_t *key,
|
inline bool set_user_data (hb_user_data_key_t *key,
|
||||||
void * data,
|
void * data,
|
||||||
hb_destroy_func_t destroy_func,
|
hb_destroy_func_t destroy_func,
|
||||||
|
@ -155,13 +161,15 @@ struct hb_object_header_t
|
||||||
return user_data.set (key, data, destroy_func, replace);
|
return user_data.set (key, data, destroy_func, replace);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename type> friend void *hb_object_get_user_data (type *obj,
|
template <typename type> friend
|
||||||
hb_user_data_key_t *key);
|
static inline void *hb_object_get_user_data (type *obj,
|
||||||
|
hb_user_data_key_t *key);
|
||||||
inline void *get_user_data (hb_user_data_key_t *key) {
|
inline void *get_user_data (hb_user_data_key_t *key) {
|
||||||
return user_data.get (key);
|
return user_data.get (key);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Type> friend void hb_object_trace (const Type *obj, const char *function);
|
template <typename Type> friend
|
||||||
|
static inline void hb_object_trace (const Type *obj, const char *function);
|
||||||
inline void trace (const char *function) const {
|
inline void trace (const char *function) const {
|
||||||
if (unlikely (!this)) return;
|
if (unlikely (!this)) return;
|
||||||
DEBUG_MSG (OBJECT, (void *) this,
|
DEBUG_MSG (OBJECT, (void *) this,
|
||||||
|
|
Loading…
Reference in New Issue