From df14ff353f4a3ebe53faab97d22134c3d24825c2 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 5 Feb 2024 11:41:54 +0100 Subject: src/rtree: remove usage --- src/RTree.hpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/RTree.hpp b/src/RTree.hpp index 7820ddd7..3ac1bde1 100644 --- a/src/RTree.hpp +++ b/src/RTree.hpp @@ -5,9 +5,10 @@ #include #include -#include +#include #include #include +#include #ifdef __GNUG__ #pragma GCC diagnostic push @@ -348,13 +349,11 @@ void RTREE_QUAL::CopyRec(Node* current, Node* other) Branch* currentBranch = ¤t->m_branch[index]; Branch* otherBranch = &other->m_branch[index]; - std::copy(otherBranch->m_rect.m_min, - otherBranch->m_rect.m_min + NUMDIMS, - currentBranch->m_rect.m_min); + Corrade::Utility::copy({otherBranch->m_rect.m_min, NUMDIMS}, + currentBranch->m_rect.m_min); - std::copy(otherBranch->m_rect.m_max, - otherBranch->m_rect.m_max + NUMDIMS, - currentBranch->m_rect.m_max); + Corrade::Utility::copy({otherBranch->m_rect.m_max, NUMDIMS}, + currentBranch->m_rect.m_max); currentBranch->m_child = AllocNode(); CopyRec(currentBranch->m_child, otherBranch->m_child); @@ -367,13 +366,11 @@ void RTREE_QUAL::CopyRec(Node* current, Node* other) Branch* currentBranch = ¤t->m_branch[index]; Branch* otherBranch = &other->m_branch[index]; - std::copy(otherBranch->m_rect.m_min, - otherBranch->m_rect.m_min + NUMDIMS, - currentBranch->m_rect.m_min); + Corrade::Utility::copy({otherBranch->m_rect.m_min, NUMDIMS}, + currentBranch->m_rect.m_min); - std::copy(otherBranch->m_rect.m_max, - otherBranch->m_rect.m_max + NUMDIMS, - currentBranch->m_rect.m_max); + Corrade::Utility::copy({otherBranch->m_rect.m_max, NUMDIMS}, + currentBranch->m_rect.m_max); currentBranch->m_data = otherBranch->m_data; } -- cgit v1.2.3