callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css selector: Use a builtin to count bits

Browse Source
This commit is contained in:
Matthias Clasen
2015-09-10 20:42:58 -04:00
parent a831f1fb11
commit 83d68ea107
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkcssselector.c
View File

@ -746,15 +746,19 @@ gtk_css_selector_region_get_change (const GtkCssSelector *selector, GtkCssChange
return previous_change | GTK_CSS_CHANGE_REGION; return previous_change | GTK_CSS_CHANGE_REGION;
} }
static guint static inline guint
count_bits (guint n) count_bits (guint n)
{ {
#if defined(__GNUC__)
return (guint) __builtin_popcount (n);
#else
guint result = 0; guint result = 0;
for (result = 0; n != 0; result++) for (result = 0; n != 0; result++)
n &= n - 1; n &= n - 1;
return result; return result;
#endif
} }
static void static void
@ -771,7 +775,7 @@ gtk_css_selector_region_add_specificity (const GtkCssSelector *selector,
static guint static guint
gtk_css_selector_region_hash_one (const GtkCssSelector *a) gtk_css_selector_region_hash_one (const GtkCssSelector *a)
{ {
return g_str_hash (a->region.name) ^ a->region.flags; return GPOINTER_TO_UINT (a->region.name) ^ a->region.flags;
} }
static int static int
@ -825,7 +829,12 @@ static int
comp_class (const GtkCssSelector *a, comp_class (const GtkCssSelector *a,
const GtkCssSelector *b) const GtkCssSelector *b)
{ {
return a->style_class.style_class - b->style_class.style_class; if (a->style_class.style_class < b->style_class.style_class)
return -1;
if (a->style_class.style_class > b->style_class.style_class)
return 1;
else
return 0;
} }
DEFINE_SIMPLE_SELECTOR(class, CLASS, print_class, match_class, hash_class, comp_class, FALSE, TRUE, FALSE) DEFINE_SIMPLE_SELECTOR(class, CLASS, print_class, match_class, hash_class, comp_class, FALSE, TRUE, FALSE)