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

Remove HB_CONST_FUNC and HB_PURE_FUNC

Browse Source 
They are not necessary for inline functions.
This commit is contained in:
Behdad Esfahbod 2020-06-29 02:04:16 -07:00
parent cba9893ac5
commit c55bf55154
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-algs.hh
View File

@ -537,7 +537,7 @@ HB_FUNCOBJ (hb_clamp);
/* Return the number of 1 bits in v. */ /* Return the number of 1 bits in v. */
template <typename T> template <typename T>
static inline HB_CONST_FUNC unsigned int static inline unsigned int
hb_popcount (T v) hb_popcount (T v)
{ {
#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) #if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
@ -578,7 +578,7 @@ hb_popcount (T v)
/* Returns the number of bits needed to store number */ /* Returns the number of bits needed to store number */
template <typename T> template <typename T>
static inline HB_CONST_FUNC unsigned int static inline unsigned int
hb_bit_storage (T v) hb_bit_storage (T v)
{ {
if (unlikely (!v)) return 0; if (unlikely (!v)) return 0;
@ -652,7 +652,7 @@ hb_bit_storage (T v)
/* Returns the number of zero bits in the least significant side of v */ /* Returns the number of zero bits in the least significant side of v */
template <typename T> template <typename T>
static inline HB_CONST_FUNC unsigned int static inline unsigned int
hb_ctz (T v) hb_ctz (T v)
{ {
if (unlikely (!v)) return 8 * sizeof (T); if (unlikely (!v)) return 8 * sizeof (T);

2
src/hb-face.hh
View File

@ -81,7 +81,7 @@ struct hb_face_t
return blob; return blob;
} }
HB_PURE_FUNC unsigned int get_upem () const unsigned int get_upem () const
{ {
unsigned int ret = upem.get_relaxed (); unsigned int ret = upem.get_relaxed ();
if (unlikely (!ret)) if (unlikely (!ret))

4
src/hb.hh
View File

@ -245,12 +245,8 @@ extern "C" void hb_free_impl(void *ptr);
#endif #endif
#if defined(__GNUC__) && (__GNUC__ >= 3) #if defined(__GNUC__) && (__GNUC__ >= 3)
#define HB_PURE_FUNC __attribute__((pure))
#define HB_CONST_FUNC __attribute__((const))
#define HB_PRINTF_FUNC(format_idx, arg_idx) __attribute__((__format__ (__printf__, format_idx, arg_idx))) #define HB_PRINTF_FUNC(format_idx, arg_idx) __attribute__((__format__ (__printf__, format_idx, arg_idx)))
#else #else
#define HB_PURE_FUNC
#define HB_CONST_FUNC
#define HB_PRINTF_FUNC(format_idx, arg_idx) #define HB_PRINTF_FUNC(format_idx, arg_idx)
#endif #endif
#if defined(__GNUC__) && (__GNUC__ >= 4) || (__clang__) #if defined(__GNUC__) && (__GNUC__ >= 4) || (__clang__)