From ad7ea13b7aa3dbdf25c0455f39c69dfe29d90df8 Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Mon, 19 Jul 2021 21:37:54 +0200 Subject: [PATCH] [test][index] Rebind allocator with container::allocator_traits<>. --- index/test/rtree/test_rtree.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/index/test/rtree/test_rtree.hpp b/index/test/rtree/test_rtree.hpp index 89aaf02dd..77f1f5312 100644 --- a/index/test/rtree/test_rtree.hpp +++ b/index/test/rtree/test_rtree.hpp @@ -3,8 +3,8 @@ // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. -// This file was modified by Oracle on 2019. -// Modifications copyright (c) 2019, Oracle and/or its affiliates. +// This file was modified by Oracle on 2019-2021. +// Modifications copyright (c) 2019-2021, Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Use, modification and distribution is subject to the Boost Software License, @@ -1694,7 +1694,7 @@ void test_rtree_queries(Parameters const& parameters, Allocator const& allocator { typedef bgi::indexable I; typedef bgi::equal_to E; - typedef typename Allocator::template rebind::other A; + typedef typename boost::container::allocator_traits::template rebind_alloc A; typedef bgi::rtree Tree; typedef typename Tree::bounds_type B; @@ -1717,7 +1717,7 @@ void test_rtree_modifiers(Parameters const& parameters, Allocator const& allocat { typedef bgi::indexable I; typedef bgi::equal_to E; - typedef typename Allocator::template rebind::other A; + typedef typename boost::container::allocator_traits::template rebind_alloc A; typedef bgi::rtree Tree; typedef typename Tree::bounds_type B; @@ -1754,7 +1754,7 @@ void test_count_rtree_values(Parameters const& parameters, Allocator const& allo typedef bgi::indexable I; typedef bgi::equal_to E; - typedef typename Allocator::template rebind::other A; + typedef typename boost::container::allocator_traits::template rebind_alloc A; typedef bgi::rtree Tree; typedef typename Tree::bounds_type B; @@ -1797,7 +1797,7 @@ void test_rtree_count(Parameters const& parameters, Allocator const& allocator) typedef bgi::indexable I; typedef bgi::equal_to E; - typedef typename Allocator::template rebind::other A; + typedef typename boost::container::allocator_traits::template rebind_alloc A; typedef bgi::rtree Tree; typedef typename Tree::bounds_type B; @@ -1828,7 +1828,7 @@ void test_rtree_bounds(Parameters const& parameters, Allocator const& allocator) { typedef bgi::indexable I; typedef bgi::equal_to E; - typedef typename Allocator::template rebind::other A; + typedef typename boost::container::allocator_traits::template rebind_alloc A; typedef bgi::rtree Tree; typedef typename Tree::bounds_type B; //typedef typename bg::traits::point_type::type P; @@ -1886,7 +1886,7 @@ void test_rtree_range(Parameters const& parameters, Allocator const& allocator) typedef bgi::indexable I; typedef bgi::equal_to E; - typedef typename Allocator::template rebind::other A; + typedef typename boost::container::allocator_traits::template rebind_alloc A; typedef bgi::rtree Tree; typedef typename Tree::bounds_type B;