X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fsorter%2Fs-radix.h;h=cef258067c2a63ba45e47c9a3662b2ceaeb9a861;hb=959566090f98dd31eaa67d3d5959b641e5fe902b;hp=289f255d69b96996d21612b050bb9f0cb621b617;hpb=031256ad2e123eec58521f8e3eb9496c197641d2;p=libucw.git diff --git a/ucw/sorter/s-radix.h b/ucw/sorter/s-radix.h index 289f255d..cef25806 100644 --- a/ucw/sorter/s-radix.h +++ b/ucw/sorter/s-radix.h @@ -9,10 +9,10 @@ #include -static void P(radix_split)(struct sort_context *ctx UNUSED, struct sort_bucket *bin, struct sort_bucket **bouts, uns bitpos, uns numbits) +static void P(radix_split)(struct sort_context *ctx UNUSED, struct sort_bucket *bin, struct sort_bucket **bouts, uint bitpos, uint numbits) { - uns nbucks = 1 << numbits; - uns mask = nbucks - 1; + uint nbucks = 1 << numbits; + uint mask = nbucks - 1; struct fastbuf *in = sbuck_read(bin); P(key) k; @@ -22,7 +22,7 @@ static void P(radix_split)(struct sort_context *ctx UNUSED, struct sort_bucket * while (P(read_key)(in, &k)) { P(hash_t) h = P(hash)(&k); - uns i = (h >> bitpos) & mask; + uint i = (h >> bitpos) & mask; if (unlikely(!outs[i])) outs[i] = sbuck_write(bouts[i]); P(copy_data)(&k, in, outs[i]);