summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjan.reininghaus <jan.reininghaus@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2013-05-08 14:40:44 +0000
committerjan.reininghaus <jan.reininghaus@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2013-05-08 14:40:44 +0000
commit0bf125e98bbf5a6f046489ffbf0790724a1223bd (patch)
treeb72fb1957a07943833f3ec62f51f6776ee134000
parentf113ac6d1ce16ce95bff271d2c6dc6783d820cb7 (diff)
removed explicit inlining from bit_tree_pivot_column.hv1.2
git-svn-id: https://phat.googlecode.com/svn/trunk@78 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d
-rw-r--r--include/phat/representations/bit_tree_pivot_column.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/phat/representations/bit_tree_pivot_column.h b/include/phat/representations/bit_tree_pivot_column.h
index 478cb53..9e72530 100644
--- a/include/phat/representations/bit_tree_pivot_column.h
+++ b/include/phat/representations/bit_tree_pivot_column.h
@@ -45,7 +45,7 @@ namespace phat {
// (-x)&x isolates the rightmost bit.
// The whole method is much faster than calling log2i, and very comparable to using ScanBitForward/Reverse intrinsic,
// which should be one CPU instruction, but is not portable.
- inline size_t rightmost_pos(const block_type value) const
+ size_t rightmost_pos(const block_type value) const
{
return 64 - 1 - debrujin_magic_table[((value & (-(int64_t)value))*0x07EDD5E59A4E28C2) >> 58];
}
@@ -69,7 +69,7 @@ namespace phat {
data.resize(upper_blocks + bottom_blocks_needed, 0);
}
- inline index max_index() const
+ index max_index() const
{
if (!data[0])
return -1;
@@ -95,12 +95,12 @@ namespace phat {
return -1;
}
- inline bool empty() const
+ bool empty() const
{
return data[0] == 0;
}
- inline void add_index(const size_t entry)
+ void add_index(const size_t entry)
{
const block_type ONE = 1;
const block_type block_modulo_mask = ((ONE << block_shift) - 1);
@@ -150,7 +150,7 @@ namespace phat {
}
}
- inline bool empty() {
+ bool empty() {
return !data[0];
}
};