Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-sorter

[libucw.git] / lib / sorter / s-radix.h

diff --git a/lib/sorter/s-radix.h b/lib/sorter/s-radix.h
index c83d6049996df7ead4ea2f59002f2c33115a86a3..289f255d69b96996d21612b050bb9f0cb621b617 100644 (file)
--- a/lib/sorter/s-radix.h
+++ b/lib/sorter/s-radix.h
@@ -7,8 +7,6 @@
  *     of the GNU Lesser General Public License.
  */
 
  *     of the GNU Lesser General Public License.
  */
 

-/* FIXME: This is a very trivial implementation so far. Use fbdirect and such things to speed up. */
-

 #include <string.h>
 
 static void P(radix_split)(struct sort_context *ctx UNUSED, struct sort_bucket *bin, struct sort_bucket **bouts, uns bitpos, uns numbits)
 #include <string.h>
 
 static void P(radix_split)(struct sort_context *ctx UNUSED, struct sort_bucket *bin, struct sort_bucket **bouts, uns bitpos, uns numbits)


@@ -23,7 +21,7 @@ static void P(radix_split)(struct sort_context *ctx UNUSED, struct sort_bucket *
 
   while (P(read_key)(in, &k))
     {
 
   while (P(read_key)(in, &k))
     {

-      uns h = P(hash)(&k);
+      P(hash_t) h = P(hash)(&k);

       uns i = (h >> bitpos) & mask;
       if (unlikely(!outs[i]))
        outs[i] = sbuck_write(bouts[i]);
       uns i = (h >> bitpos) & mask;
       if (unlikely(!outs[i]))
        outs[i] = sbuck_write(bouts[i]);