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

bitmask: Use gsize, not size_t

Browse Source 
We want to use the same type everywhere to avoid surprises.
This commit is contained in:
Benjamin Otte
2015-09-27 13:20:52 +02:00
parent 97293865b5
commit 7c762fe1c4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkbitmaskprivateimpl.h
View File

@ -92,7 +92,7 @@ _gtk_bitmask_get (const GtkBitmask *mask,
return _gtk_allocated_bitmask_get (mask, index_); return _gtk_allocated_bitmask_get (mask, index_);
else else
return index_ < GTK_BITMASK_N_DIRECT_BITS return index_ < GTK_BITMASK_N_DIRECT_BITS
? !!(_gtk_bitmask_to_bits (mask) & (((size_t) 1) << index_)) ? !!(_gtk_bitmask_to_bits (mask) & (((gsize) 1) << index_))
: FALSE; : FALSE;
} }
@ -109,9 +109,9 @@ _gtk_bitmask_set (GtkBitmask *mask,
gsize bits = _gtk_bitmask_to_bits (mask); gsize bits = _gtk_bitmask_to_bits (mask);
if (value) if (value)
bits |= ((size_t) 1) << index_; bits |= ((gsize) 1) << index_;
else else
bits &= ~(((size_t) 1) << index_); bits &= ~(((gsize) 1) << index_);
return _gtk_bitmask_from_bits (bits); return _gtk_bitmask_from_bits (bits);
} }
@ -129,7 +129,7 @@ _gtk_bitmask_invert_range (GtkBitmask *mask,
return _gtk_allocated_bitmask_invert_range (mask, start, end); return _gtk_allocated_bitmask_invert_range (mask, start, end);
else else
{ {
size_t invert = (((size_t) 1) << end) - (((size_t) 1) << start); gsize invert = (((gsize) 1) << end) - (((gsize) 1) << start);
return _gtk_bitmask_from_bits (_gtk_bitmask_to_bits (mask) ^ invert); return _gtk_bitmask_from_bits (_gtk_bitmask_to_bits (mask) ^ invert);
} }