Backport #8433 : Improve code of class BePlusTree

Author: hvlad

src/common/classes/GenericMap.h

@@ -97,7 +97,7 @@ class GenericMap : public AutoStorage
 	typedef typename KeyValuePair::first_type KeyType;
 	typedef typename KeyValuePair::second_type ValueType;
 
-	typedef BePlusTree<KeyValuePair*, KeyType, MemoryPool, FirstObjectKey<KeyValuePair>, KeyComparator> ValuesTree;
+	typedef BePlusTree<KeyValuePair*, KeyType, FirstObjectKey<KeyValuePair>, KeyComparator> ValuesTree;
 	typedef typename ValuesTree::Accessor TreeAccessor;
 	typedef typename ValuesTree::ConstAccessor ConstTreeAccessor;
 
@@ -139,10 +139,10 @@ class GenericMap : public AutoStorage
 	friend class Accessor;
 	friend class ConstAccessor;
 
-	GenericMap() : tree(&getPool()), mCount(0) { }
+	GenericMap() : tree(getPool()), mCount(0) { }
 
 	explicit GenericMap(MemoryPool& a_pool)
-		: AutoStorage(a_pool), tree(&getPool()), mCount(0)
+		: AutoStorage(a_pool), tree(getPool()), mCount(0)
 	{ }
 
 	~GenericMap()

src/common/classes/sparse_bitmap.h

@@ -60,12 +60,12 @@ class SparseBitmap : public AutoStorage
 public:
 	// Default constructor, stack placement
 	SparseBitmap() :
-		singular(false), singular_value(0), tree(&getPool()), defaultAccessor(this)
+		singular(false), singular_value(0), tree(getPool()), defaultAccessor(this)
 	{ }
 
 	// Pooled constructor
 	explicit SparseBitmap(MemoryPool& p) :
-		AutoStorage(p), singular(false), singular_value(0), tree(&getPool()), defaultAccessor(this)
+		AutoStorage(p), singular(false), singular_value(0), tree(getPool()), defaultAccessor(this)
 	{ }
 
 	// Default accessor methods
@@ -225,7 +225,7 @@ class SparseBitmap : public AutoStorage
 		}
 	};
 
-	typedef BePlusTree<Bucket, T, MemoryPool, Bucket> BitmapTree;
+	typedef BePlusTree<Bucket, T, Bucket> BitmapTree;
 	typedef typename BitmapTree::Accessor BitmapTreeAccessor;
 
 	// Set if bitmap contains a single value only