From 62c12d494efce198271d4a6f2ac74c6810d4bbfa Mon Sep 17 00:00:00 2001 From: "jan.reininghaus" Date: Tue, 23 Apr 2013 15:27:00 +0000 Subject: warning fixes for bit_tree_column git-svn-id: https://phat.googlecode.com/svn/trunk@40 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d --- include/phat/representations/bit_tree_pivot_column.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/phat/representations/bit_tree_pivot_column.h b/include/phat/representations/bit_tree_pivot_column.h index 7002037..478cb53 100644 --- a/include/phat/representations/bit_tree_pivot_column.h +++ b/include/phat/representations/bit_tree_pivot_column.h @@ -47,7 +47,7 @@ namespace phat { // which should be one CPU instruction, but is not portable. inline size_t rightmost_pos(const block_type value) const { - return 64 - 1 - debrujin_magic_table[((value & (-value))*0x07EDD5E59A4E28C2) >> 58]; + return 64 - 1 - debrujin_magic_table[((value & (-(int64_t)value))*0x07EDD5E59A4E28C2) >> 58]; } public: @@ -55,8 +55,8 @@ namespace phat { void init(index num_cols) { int64_t n = 1; // in case of overflow - size_t bottom_blocks_needed = (num_cols+block_size_in_bits-1)/block_size_in_bits; - size_t upper_blocks = 1; + int64_t bottom_blocks_needed = (num_cols+block_size_in_bits-1)/block_size_in_bits; + int64_t upper_blocks = 1; // How many blocks/nodes of index needed to index the whole bitset? while(n * block_size_in_bits < bottom_blocks_needed) -- cgit v1.2.3