kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

kdtree++: modernize C++11

Browse Source
This commit is contained in:
wmayer
2022-01-26 21:54:29 +01:00
parent 853454a139
commit 63f256ad24
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/libkdtree/kdtree++/allocator.hpp vendored
View File

@@ -41,7 +41,7 @@ namespace KDTree
NoLeakAlloc(_Alloc_base * b) : base(b), new_node(base->_M_allocate_node()) {}
_Node_ * get() { return new_node; }
void disconnect() { new_node = NULL; }
void disconnect() { new_node = nullptr; }
~NoLeakAlloc() { if (new_node) base->_M_deallocate_node(new_node); }
};

2
src/3rdParty/libkdtree/kdtree++/iterator.hpp vendored
View File

@@ -52,7 +52,7 @@ namespace KDTree
typedef _Node_base::_Base_const_ptr _Base_const_ptr;
_Base_const_ptr _M_node;
inline _Base_iterator(_Base_const_ptr const __N = NULL)
inline _Base_iterator(_Base_const_ptr const __N = nullptr)
: _M_node(__N) {}
//inline _Base_iterator(_Base_iterator const& __THAT)
// : _M_node(__THAT._M_node) {}

12
src/3rdParty/libkdtree/kdtree++/kdtree.hpp vendored
View File

@@ -255,7 +255,7 @@ namespace KDTree
_M_erase_subtree(_M_get_root());
_M_set_leftmost(&_M_header);
_M_set_rightmost(&_M_header);
_M_set_root(NULL);
_M_set_root(nullptr);
_M_count = 0;
}
@@ -642,8 +642,8 @@ namespace KDTree
{
_M_set_leftmost(&_M_header);
_M_set_rightmost(&_M_header);
_M_header._M_parent = NULL;
_M_set_root(NULL);
_M_header._M_parent = nullptr;
_M_set_root(nullptr);
}
iterator
@@ -1157,9 +1157,9 @@ namespace KDTree
_Link_type
_M_new_node(const_reference __V, // = value_type(),
_Base_ptr const __PARENT = NULL,
_Base_ptr const __LEFT = NULL,
_Base_ptr const __RIGHT = NULL)
_Base_ptr const __PARENT = nullptr,
_Base_ptr const __LEFT = nullptr,
_Base_ptr const __RIGHT = nullptr)
{
typename _Base::NoLeakAlloc noleak(this);
_Link_type new_node = noleak.get();

14
src/3rdParty/libkdtree/kdtree++/node.hpp vendored
View File

@@ -25,9 +25,9 @@ namespace KDTree
_Base_ptr _M_left;
_Base_ptr _M_right;
_Node_base(_Base_ptr const __PARENT = NULL,
_Base_ptr const __LEFT = NULL,
_Base_ptr const __RIGHT = NULL)
_Node_base(_Base_ptr const __PARENT = nullptr,
_Base_ptr const __LEFT = nullptr,
_Base_ptr const __RIGHT = nullptr)
: _M_parent(__PARENT), _M_left(__LEFT), _M_right(__RIGHT) {}
static _Base_ptr
@@ -54,9 +54,9 @@ namespace KDTree
_Val _M_value;
_Node(_Val const& __VALUE = _Val(),
_Base_ptr const __PARENT = NULL,
_Base_ptr const __LEFT = NULL,
_Base_ptr const __RIGHT = NULL)
_Base_ptr const __PARENT = nullptr,
_Base_ptr const __LEFT = nullptr,
_Base_ptr const __RIGHT = nullptr)
: _Node_base(__PARENT, __LEFT, __RIGHT), _M_value(__VALUE) {}
#ifdef KDTREE_DEFINE_OSTREAM_OPERATORS
@@ -232,7 +232,7 @@ namespace KDTree
// Swap cur to prev, only prev is a valid node.
cur = pcur;
--cur_dim;
pcur = NULL;
pcur = nullptr;
// Probe all node's children not visited yet (siblings of the visited nodes).
const _Node_base* probe = cur;
const _Node_base* pprobe = probe;