From 4ea9c64316766590e297960f8b26bc04ac0af4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Mon, 15 Jul 2024 11:50:50 +0200
Subject: [PATCH] Use algo_equal to reduce test dependencies

---
 test/devector_test.cpp | 14 +++++++-------
 test/test_util.hpp     |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/devector_test.cpp b/test/devector_test.cpp
index 9b1ec82..ad2545d 100644
--- a/test/devector_test.cpp
+++ b/test/devector_test.cpp
@@ -25,7 +25,7 @@
 #include "check_equal_containers.hpp"
 #include "movable_int.hpp"
 
-#include <boost/algorithm/cxx14/equal.hpp>
+#include <boost/container/detail/algorithm.hpp> //algo_equal(), algo_lexicographical_compare
 
 #define BOOST_CONTAINER_DEVECTOR_ALLOC_STATS
 #include <boost/container/devector.hpp>
@@ -1136,17 +1136,17 @@ template <class Devector> void test_begin_end()
    {
       Devector actual; get_range<Devector>(10, actual);
 
-      BOOST_TEST(boost::algorithm::equal(expected.begin(), expected.end(), actual.begin(), actual.end()));
-      BOOST_TEST(boost::algorithm::equal(expected.rbegin(), expected.rend(), actual.rbegin(), actual.rend()));
-      BOOST_TEST(boost::algorithm::equal(expected.cbegin(), expected.cend(), actual.cbegin(), actual.cend()));
-      BOOST_TEST(boost::algorithm::equal(expected.crbegin(), expected.crend(), actual.crbegin(), actual.crend()));
+      BOOST_TEST(::boost::container::algo_equal(expected.begin(), expected.end(), actual.begin(), actual.end()));
+      BOOST_TEST(::boost::container::algo_equal(expected.rbegin(), expected.rend(), actual.rbegin(), actual.rend()));
+      BOOST_TEST(::boost::container::algo_equal(expected.cbegin(), expected.cend(), actual.cbegin(), actual.cend()));
+      BOOST_TEST(::boost::container::algo_equal(expected.crbegin(), expected.crend(), actual.crbegin(), actual.crend()));
    }
 
    {
       Devector cactual; get_range<Devector>(10, cactual);
 
-      BOOST_TEST(boost::algorithm::equal(expected.begin(), expected.end(), cactual.begin(), cactual.end()));
-      BOOST_TEST(boost::algorithm::equal(expected.rbegin(), expected.rend(), cactual.rbegin(), cactual.rend()));
+      BOOST_TEST(::boost::container::algo_equal(expected.begin(), expected.end(), cactual.begin(), cactual.end()));
+      BOOST_TEST(::boost::container::algo_equal(expected.rbegin(), expected.rend(), cactual.rbegin(), cactual.rend()));
    }
 }
 
diff --git a/test/test_util.hpp b/test/test_util.hpp
index bf129a1..9161011 100644
--- a/test/test_util.hpp
+++ b/test/test_util.hpp
@@ -13,6 +13,7 @@
 #define BOOST_CONTAINER_TEST_TEST_UTIL_HPP
 
 #include "test_elem.hpp"
+#include <boost/container/detail/algorithm.hpp> //algo_equal(), algo_lexicographical_compare
 
 // get_range
 
@@ -86,8 +87,7 @@ void print_range(std::ostream& out, Array (&range)[N])
 template <typename C1, typename C2, unsigned N>
 void test_equal_range(const C1& a, const C2 (&b)[N])
 {
-   bool equals = boost::algorithm::equal
-      (a.begin(), a.end(), b, b+N);
+   bool equals = ::boost::container::algo_equal(a.begin(), a.end(), b, b+N);
 
    BOOST_TEST(equals);
 
@@ -104,7 +104,7 @@ void test_equal_range(const C1& a, const C2 (&b)[N])
 template <typename C1, typename C2>
 void test_equal_range(const C1& a, const C2&b)
 {
-   bool equals = boost::algorithm::equal
+   bool equals = boost::container::algo_equal
       (a.begin(), a.end(), b.begin(), b.end());
 
    BOOST_TEST(equals);