diff options
Diffstat (limited to 'src/RTree.h')
| -rw-r--r-- | src/RTree.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/RTree.h b/src/RTree.h index 50fd0384..f4139450 100644 --- a/src/RTree.h +++ b/src/RTree.h @@ -7,7 +7,6 @@ //#define RTREE_STDIO -#include "compat/assert.hpp" #ifdef RTREE_STDIO #include <stdio.h> #endif @@ -18,9 +17,6 @@ // RTree.h // -#define RTREE_TEMPLATE template<class DATATYPE, class ELEMTYPE, int NUMDIMS, class ELEMTYPEREAL, int TMAXNODES, int TMINNODES> -#define RTREE_QUAL RTree<DATATYPE, ELEMTYPE, NUMDIMS, ELEMTYPEREAL, TMAXNODES, TMINNODES> - #define RTREE_DONT_USE_MEMPOOLS // This version does not contain a fixed memory allocator, fill in lines with EXAMPLE to implement one. #define RTREE_USE_SPHERICAL_VOLUME // Better split classification, may be slower on some systems @@ -69,7 +65,8 @@ public: RTree(); RTree(const RTree& other); - virtual ~RTree(); + virtual ~RTree() noexcept; + RTree& operator=(const RTree&); /// Insert entry /// \param a_min Min of bounding rect @@ -180,8 +177,6 @@ public: /// Get object at iterator position DATATYPE& GetAt(Iterator& a_it) { return *a_it; } -protected: - /// Minimal bounding rectangle (n-dimensional) struct Rect { @@ -189,6 +184,8 @@ protected: ELEMTYPE m_max[NUMDIMS]; ///< Max dimensions of bounding box }; +protected: + /// May be data or may be another subtree /// The parents level determines this. /// If the parents level is 0, then this is data @@ -281,7 +278,7 @@ public: void ListTree(std::vector<Rect>& vec, std::vector<Node*>& temp) const; }; -extern template class RTree<void*, unsigned, 2, float>; +extern template class RTree<std::uint64_t, float, 2, float>; //#undef RTREE_TEMPLATE //#undef RTREE_QUAL |