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

Don't use min/max as function names 

They can be macros on some systems.  Eg. mingw32.
This commit is contained in:
Behdad Esfahbod 2012-05-17 20:55:12 -04:00
parent 34961e3198
commit f039e79d54
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-set-private.hh
View File

@ -102,7 +102,7 @@ struct _hb_set_t
for (unsigned int i = 0; i < ELTS; i++) for (unsigned int i = 0; i < ELTS; i++)
elts[i] &= ~other->elts[i]; elts[i] &= ~other->elts[i];
} }
inline hb_codepoint_t min (void) const inline hb_codepoint_t get_min (void) const
{ {
for (unsigned int i = 0; i < ELTS; i++) for (unsigned int i = 0; i < ELTS; i++)
if (elts[i]) if (elts[i])
@ -111,7 +111,7 @@ struct _hb_set_t
return i * BITS + j; return i * BITS + j;
return 0; return 0;
} }
inline hb_codepoint_t max (void) const inline hb_codepoint_t get_max (void) const
{ {
for (unsigned int i = ELTS; i; i--) for (unsigned int i = ELTS; i; i--)
if (elts[i - 1]) if (elts[i - 1])

4
src/hb-set.cc
View File

@ -167,11 +167,11 @@ hb_set_subtract (hb_set_t *set,
hb_codepoint_t hb_codepoint_t
hb_set_min (hb_set_t *set) hb_set_min (hb_set_t *set)
{ {
return set->min (); return set->get_min ();
} }
hb_codepoint_t hb_codepoint_t
hb_set_max (hb_set_t *set) hb_set_max (hb_set_t *set)
{ {
return set->max (); return set->get_max ();
} }