fix warnings

Author: huanchenz

include/bitvector.hpp

@@ -50,7 +50,7 @@ class Bitvector {
     position_t distanceToNextSetBit(const position_t pos) const;
 
 private:
-    position_t computeTotalNumBits(const std::vector<position_t>& num_bits_per_level, 
+    void computeTotalNumBits(const std::vector<position_t>& num_bits_per_level, 
 				   const level_t start_level, 
 				   const level_t end_level/* non-inclusive */);
 
@@ -100,7 +100,7 @@ position_t Bitvector::distanceToNextSetBit (const position_t pos) const {
     }
 }
 
-position_t Bitvector::computeTotalNumBits(const std::vector<position_t>& num_bits_per_level, 
+void Bitvector::computeTotalNumBits(const std::vector<position_t>& num_bits_per_level, 
 					  const level_t start_level, 
 					  const level_t end_level/* non-inclusive */) {
     num_bits_ = 0;

include/label_vector.hpp

@@ -21,13 +21,13 @@ class LabelVector {
 	    end_level = labels_per_level.size();
 
 	num_bytes_ = 0;
-	for (int level = start_level; level < end_level; level++)
+	for (level_t level = start_level; level < end_level; level++)
 	    num_bytes_ += labels_per_level[level].size();
 
 	labels_ = new label_t[num_bytes_];
 
 	position_t pos = 0;
-	for (int level = start_level; level < end_level; level++) {
+	for (level_t level = start_level; level < end_level; level++) {
 	    for (position_t idx = 0; idx < labels_per_level[level].size(); idx++) {
 		labels_[pos] = labels_per_level[level][idx];
 		pos++;

include/popcount.h

@@ -73,7 +73,7 @@ inline uint64_t popcountLinear(uint64_t *bits, uint64_t x, uint64_t nbits) {
     uint64_t p = 0;
 
     __builtin_prefetch(bits + x + 7, 0); //huanchen
-    for (int i = 0; i < lastword; i++) { /* tested;  manually unrolling doesn't help, at least in C */
+    for (uint64_t i = 0; i < lastword; i++) { /* tested;  manually unrolling doesn't help, at least in C */
         //__builtin_prefetch(bits + x + i + 3, 0);
         p += popcount(bits[x+i]); // note that use binds us to 64 bit popcount impls
     }

include/surf_builder.hpp

@@ -364,7 +364,7 @@ void SuRFBuilder::initDenseVectors(const level_t level) {
     prefixkey_indicator_bits_.push_back(std::vector<word_t>());
 
     for (position_t nc = 0; nc < node_counts_[level]; nc++) {
-	for (int i = 0; i < kFanout; i += kWordSize) {
+	for (int i = 0; i < (int)kFanout; i += kWordSize) {
 	    bitmap_labels_[level].push_back(0);
 	    bitmap_child_indicator_bits_[level].push_back(0);
 	}