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

Improve cmp function parameter namings and casts 

No semantic change.
This commit is contained in:
Behdad Esfahbod 2010-09-28 16:23:58 -04:00
parent dca8aff246
commit 4e573715ae
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-open-type-private.hh
View File

@ -397,7 +397,7 @@ struct IntType
inline operator Type(void) const { return v; } inline operator Type(void) const { return v; }
inline bool operator == (const IntType<Type> &o) const { return v == o.v; } inline bool operator == (const IntType<Type> &o) const { return v == o.v; }
inline bool operator != (const IntType<Type> &o) const { return v != o.v; } inline bool operator != (const IntType<Type> &o) const { return v != o.v; }
inline int cmp (Type b) const { Type a = v; return b < a ? -1 : b == a ? 0 : +1; } inline int cmp (Type a) const { Type b = v; return a < b ? -1 : a == b ? 0 : +1; }
inline bool sanitize (hb_sanitize_context_t *c) { inline bool sanitize (hb_sanitize_context_t *c) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
return likely (c->check_struct (this)); return likely (c->check_struct (this));
@ -719,8 +719,8 @@ struct SortedArrayOf : ArrayOf<Type> {
inline int search (const SearchType &x) const { inline int search (const SearchType &x) const {
class Cmp { class Cmp {
public: static int cmp (const void *p1, const void *p2) { public: static int cmp (const void *p1, const void *p2) {
const SearchType *a = (const SearchType *) p1; const SearchType *a = reinterpret_cast<const SearchType *>(p1);
const Type *b = (const Type *) p2; const Type *b = reinterpret_cast<const Type *>(p2);
return b->cmp (*a); return b->cmp (*a);
} }
}; };

6
src/hb-ot-layout-common-private.hh
View File

@ -56,9 +56,9 @@ HB_END_DECLS
template <typename Type> template <typename Type>
struct Record struct Record
{ {
inline int cmp (hb_tag_t b) const { inline int cmp (hb_tag_t a) const {
hb_tag_t a = tag; hb_tag_t b = tag;
return b < a ? -1 : b == a ? 0 : +1; return a < b ? -1 : a == b ? 0 : +1;
} }
inline bool sanitize (hb_sanitize_context_t *c, void *base) { inline bool sanitize (hb_sanitize_context_t *c, void *base) {

8
src/hb-ot-shape.cc
View File

@ -105,8 +105,8 @@ struct hb_mask_allocator_t {
static int static int
cmp (const void *p1, const void *p2) cmp (const void *p1, const void *p2)
{ {
const feature_info_t *a = (const feature_info_t *) p1; const feature_info_t *a = reinterpret_cast<const feature_info_t *>(p1);
const feature_info_t *b = (const feature_info_t *) p2; const feature_info_t *b = reinterpret_cast<const feature_info_t *>(p2);
if (a->tag != b->tag) if (a->tag != b->tag)
return a->tag < b->tag ? -1 : 1; return a->tag < b->tag ? -1 : 1;
@ -124,8 +124,8 @@ struct hb_mask_allocator_t {
static int static int
cmp (const void *p1, const void *p2) cmp (const void *p1, const void *p2)
{ {
const feature_map_t *a = (const feature_map_t *) p1; const feature_map_t *a = reinterpret_cast<const feature_map_t *>(p1);
const feature_map_t *b = (const feature_map_t *) p2; const feature_map_t *b = reinterpret_cast<const feature_map_t *>(p2);
return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0;
} }