From b083d36d68706d8e3daf1ecadfec1a048e493378 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 3 Jul 2024 14:13:34 +0300 Subject: [PATCH] Fixed 23-bit build with some GCC versions. --- modules/3d/src/octree.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/3d/src/octree.cpp b/modules/3d/src/octree.cpp index 04811d6183..a1272c8743 100644 --- a/modules/3d/src/octree.cpp +++ b/modules/3d/src/octree.cpp @@ -410,8 +410,9 @@ void Octree::getPointCloudByOctree(OutputArray restorePointCloud, OutputArray re double resolution = p->resolution; std::vector outPts, outColors; - std::stack, size_t, size_t, size_t>> toCheck; - toCheck.push({root, 0, 0, 0}); + typedef std::tuple, size_t, size_t, size_t> stack_element; + std::stack toCheck; + toCheck.push(stack_element(root, 0, 0, 0)); while (!toCheck.empty()) { auto top = toCheck.top(); @@ -456,7 +457,7 @@ void Octree::getPointCloudByOctree(OutputArray restorePointCloud, OutputArray re x_copy = (x_copy << 1) | x_offSet; y_copy = (y_copy << 1) | y_offSet; z_copy = (z_copy << 1) | z_offSet; - toCheck.push({node->children[i], x_copy, y_copy, z_copy}); + toCheck.push(stack_element(node->children[i], x_copy, y_copy, z_copy)); } } }