pyextensibletype.diff

diff -ru numba-0.8.1/deps/pyextensibletype/include/interning.h numba/deps/pyextensibletype/include/interning.h
--- numba-0.8.1/deps/pyextensibletype/include/interning.h       2013-05-03 10:59:52.000000000 -0400
+++ numba/deps/pyextensibletype/include/interning.h     2013-07-18 17:54:34.000000000 -0400
@@ -170,7 +170,6 @@
     const char *secret = table->secrets;
     int tries = 0;
     uint64_t prehash;
-    int result;

     while (1) {
         int result;
diff -ru numba-0.8.1/deps/pyextensibletype/include/perfecthash.h numba/deps/pyextensibletype/include/perfecthash.h
--- numba-0.8.1/deps/pyextensibletype/include/perfecthash.h     2013-05-03 10:59:52.000000000 -0400
+++ numba/deps/pyextensibletype/include/perfecthash.h   2013-07-18 17:54:34.000000000 -0400
@@ -57,7 +57,7 @@
   /* Then simply write indices to the bins */
   for (ibin = 0; ibin != nbins; ++ibin) {
     binsize = binsizes[ibin];
-    sort_bins[binsize][0] = ibin;
+    sort_bins[binsize][0] = (uint16_t)ibin;
     sort_bins[binsize]++;
   }
 }
@@ -106,8 +106,9 @@
         int k;
         int collides = 0;
         for (k = 0; k != binsizes[bin]; ++k) {
-          uint16_t slot = (((hashes[bins[BIN_LIMIT * bin + k]] >> r) & m_f) ^
-                           dval);
+          uint16_t slot = (uint16_t)(
+                            ((hashes[bins[BIN_LIMIT * bin + k]] >> r) & m_f) ^
+                             dval);
           if (taken[slot]) {
             collides = 1;
             break;
@@ -122,8 +123,9 @@
         int k;
         /* mark slots as taken and shuffle in table elements */
         for (k = 0; k != binsizes[bin]; ++k) {
-          uint16_t slot = (((hashes[bins[BIN_LIMIT * bin + k]] >> r) & m_f) ^
-                           dval);
+          uint16_t slot = (uint16_t)(
+                            ((hashes[bins[BIN_LIMIT * bin + k]] >> r) & m_f) ^
+                             dval);
           taken[slot] = 1;
           table->entries[slot] = entries_copy[bins[BIN_LIMIT * bin + k]];
         }
@@ -137,7 +139,7 @@

 int PyCustomSlots_PerfectHash(PyCustomSlots_Table *table, uint64_t *hashes) {
   int result, r, retcode;
-  uint32_t bin, j;
+  uint32_t bin;
   uint8_t binsize;
   uint16_t i, n = table->n, b = table->b;
   uint64_t m_f = PyCustomSlots_roundup_2pow(table->n) - 1;
@@ -168,7 +170,7 @@
     number_of_bins_by_size[binsize] = 0;
   }
   for (i = 0; i != n; ++i) {
-    bin = hashes[i] & m_g;
+    bin = (uint32_t)(hashes[i] & m_g);
     if (bin > b)
         abort();
     binsize = ++binsizes[bin];