Fix samba related crashes

[lyx.git] / src / support / weighted_btree.h

diff --git a/src/support/weighted_btree.h b/src/support/weighted_btree.h
index 0982049b3cf2e8e874e73f472307c1f4c33f2883..b64f95366f6e5cb2f398560b0ffe7156eaf0237c 100644 (file)
--- a/src/support/weighted_btree.h
+++ b/src/support/weighted_btree.h
@@ -29,6 +29,7 @@
 // *** Required Headers from the STL
 
 #include <algorithm>
+#include <cstddef>
 #include <functional>
 #include <istream>
 #include <ostream>
@@ -1323,7 +1324,7 @@ public:
 
         leaf_node *leaf = static_cast<leaf_node*>(n);
 
-        int slot = find_lower(leaf, key);
+        unsigned short slot = find_lower(leaf, key);
         return (slot < leaf->slotuse && key_equal(key, leaf->slotkey[slot]))
             ? iterator(leaf, slot) : end();
     }
@@ -1376,7 +1377,7 @@ public:
 
         leaf_node *leaf = static_cast<leaf_node*>(n);
 
-        int slot = find_summed_weight_lower(leaf, weight);
+        unsigned short slot = find_summed_weight_lower(leaf, weight);
         for (unsigned short s = 0; s < slot; ++s)
             weight -= leaf->weights[s];
 
@@ -2049,7 +2050,7 @@ private:
         {
             leaf_node *leaf = static_cast<leaf_node*>(n);
 
-            int slot = find_lower(leaf, key);
+            unsigned short slot = find_lower(leaf, key);
 
             if (!allow_duplicates && slot < leaf->slotuse && key_equal(key, leaf->slotkey[slot])) {
                 return std::pair<iterator, bool>(iterator(leaf, slot), false);