fixes

Author: tzaeschke

include/phtree/common/b_plus_tree_heap.h

@@ -463,7 +463,7 @@ class b_plus_tree_heap {
     }
 
   private:
-    b_plus_tree_multimap<Key, Value, Compare> data_;  // The heap array.
+    ::phtree::bptree::b_plus_tree_multimap<Key, Value, Compare> data_;  // The heap array.
 };
 
 namespace detail {

include/phtree/v16/iterator_knn_hs2.h

@@ -212,8 +212,8 @@ class IteratorKnnHS2 : public IteratorWithFilter<T, CONVERT, FILTER> {
     }
 
     double DistanceToNode(const KeyInternal& prefix, std::uint32_t bits_to_ignore) {
-        assert(bits_to_ignore < MAX_BIT_WIDTH<SCALAR>);
-        SCALAR mask_min = MAX_MASK<SCALAR> << bits_to_ignore;
+        assert(bits_to_ignore < detail::MAX_BIT_WIDTH<SCALAR>);
+        SCALAR mask_min = detail::MAX_MASK<SCALAR> << bits_to_ignore;
         SCALAR mask_max = ~mask_min;
         KeyInternal buf;
         // The following calculates the point inside the node that is closest to center_.