From 9c73691528b0caeb1e20d56d7ecdd065c602162f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Sat, 2 Jan 2021 13:38:52 +0100
Subject: [PATCH] Update lightweight_test.hpp and hash.hpp references to the
 actual boost components.

---
 example/doc_bucket_traits.cpp         | 2 +-
 example/doc_iterator_from_value.cpp   | 2 +-
 example/doc_unordered_set.cpp         | 2 +-
 include/boost/intrusive/hashtable.hpp | 2 +-
 include/boost/intrusive/sgtree.hpp    | 1 -
 test/container_size_test.cpp          | 2 +-
 test/custom_bucket_traits_test.cpp    | 2 +-
 test/function_hook_test.cpp           | 2 +-
 test/generic_assoc_test.hpp           | 2 +-
 test/generic_multiset_test.hpp        | 2 +-
 test/generic_set_test.hpp             | 2 +-
 test/itestvalue.hpp                   | 2 +-
 test/list_test.cpp                    | 2 +-
 test/nonhook_node.hpp                 | 2 +-
 test/slist_test.cpp                   | 2 +-
 test/stateful_value_traits_test.cpp   | 2 +-
 test/test_container.hpp               | 2 +-
 test/unordered_multiset_test.cpp      | 2 +-
 test/unordered_set_test.cpp           | 2 +-
 test/unordered_test.hpp               | 2 +-
 20 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/example/doc_bucket_traits.cpp b/example/doc_bucket_traits.cpp
index 20ce7be..9494ed9 100644
--- a/example/doc_bucket_traits.cpp
+++ b/example/doc_bucket_traits.cpp
@@ -11,7 +11,7 @@
 /////////////////////////////////////////////////////////////////////////////
 //[doc_bucket_traits
 #include <boost/intrusive/unordered_set.hpp>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 #include <vector>
 
 using namespace boost::intrusive;
diff --git a/example/doc_iterator_from_value.cpp b/example/doc_iterator_from_value.cpp
index f9c1a9a..c8105eb 100644
--- a/example/doc_iterator_from_value.cpp
+++ b/example/doc_iterator_from_value.cpp
@@ -12,7 +12,7 @@
 //[doc_iterator_from_value
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 #include <vector>
 
 using namespace boost::intrusive;
diff --git a/example/doc_unordered_set.cpp b/example/doc_unordered_set.cpp
index ca0b5be..e793f87 100644
--- a/example/doc_unordered_set.cpp
+++ b/example/doc_unordered_set.cpp
@@ -13,7 +13,7 @@
 #include <boost/intrusive/unordered_set.hpp>
 #include <vector>
 #include <functional>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 
 using namespace boost::intrusive;
 
diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp
index 1fada98..c9c3786 100644
--- a/include/boost/intrusive/hashtable.hpp
+++ b/include/boost/intrusive/hashtable.hpp
@@ -35,7 +35,7 @@
 #include <boost/intrusive/detail/mpl.hpp>
 
 //boost
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 #include <boost/intrusive/detail/assert.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/move/utility_core.hpp>
diff --git a/include/boost/intrusive/sgtree.hpp b/include/boost/intrusive/sgtree.hpp
index 15e7d0c..71223bf 100644
--- a/include/boost/intrusive/sgtree.hpp
+++ b/include/boost/intrusive/sgtree.hpp
@@ -39,7 +39,6 @@
 #include <cstddef>
 #include <boost/intrusive/detail/minimal_less_equal_header.hpp>
 #include <boost/intrusive/detail/minimal_pair_header.hpp>   //std::pair
-#include <cmath>
 #include <cstddef>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
diff --git a/test/container_size_test.cpp b/test/container_size_test.cpp
index e320ff5..b7a8d35 100644
--- a/test/container_size_test.cpp
+++ b/test/container_size_test.cpp
@@ -9,7 +9,7 @@
 // See http://www.boost.org/libs/intrusive for documentation.
 //
 /////////////////////////////////////////////////////////////////////////////
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>
 
 #include <boost/intrusive/list.hpp>
diff --git a/test/custom_bucket_traits_test.cpp b/test/custom_bucket_traits_test.cpp
index 843cf84..84968b2 100644
--- a/test/custom_bucket_traits_test.cpp
+++ b/test/custom_bucket_traits_test.cpp
@@ -11,7 +11,7 @@
 /////////////////////////////////////////////////////////////////////////////
 #include <boost/intrusive/unordered_set.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 #include <boost/static_assert.hpp>
 #include <vector>
 
diff --git a/test/function_hook_test.cpp b/test/function_hook_test.cpp
index 9b16395..8b1c6ac 100644
--- a/test/function_hook_test.cpp
+++ b/test/function_hook_test.cpp
@@ -14,7 +14,7 @@
 #include <boost/intrusive/slist.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/unordered_set.hpp>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 
 using namespace boost::intrusive;
 
diff --git a/test/generic_assoc_test.hpp b/test/generic_assoc_test.hpp
index 74b4c5f..93d5db7 100644
--- a/test/generic_assoc_test.hpp
+++ b/test/generic_assoc_test.hpp
@@ -15,7 +15,7 @@
 #include "common_functors.hpp"
 #include <boost/intrusive/options.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "test_macros.hpp"
 #include "test_container.hpp"
 
diff --git a/test/generic_multiset_test.hpp b/test/generic_multiset_test.hpp
index 2a0ee28..c1f49a7 100644
--- a/test/generic_multiset_test.hpp
+++ b/test/generic_multiset_test.hpp
@@ -13,7 +13,7 @@
 #include <boost/container/vector.hpp>
 #include <boost/intrusive/detail/config_begin.hpp>
 #include "common_functors.hpp"
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive/options.hpp>
 #include <boost/intrusive/detail/iterator.hpp>
 #include "test_macros.hpp"
diff --git a/test/generic_set_test.hpp b/test/generic_set_test.hpp
index 9236019..2c6ba09 100644
--- a/test/generic_set_test.hpp
+++ b/test/generic_set_test.hpp
@@ -13,7 +13,7 @@
 #include <boost/container/vector.hpp>
 #include <boost/intrusive/detail/config_begin.hpp>
 #include "common_functors.hpp"
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive/options.hpp>
 #include <boost/intrusive/detail/iterator.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
diff --git a/test/itestvalue.hpp b/test/itestvalue.hpp
index 1a4ecda..6188dfa 100644
--- a/test/itestvalue.hpp
+++ b/test/itestvalue.hpp
@@ -15,7 +15,7 @@
 
 #include <iostream>
 #include <boost/intrusive/options.hpp>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include "nonhook_node.hpp"
 #include "int_holder.hpp"
diff --git a/test/list_test.cpp b/test/list_test.cpp
index e756a91..649433e 100644
--- a/test/list_test.cpp
+++ b/test/list_test.cpp
@@ -17,7 +17,7 @@
 #include "smart_ptr.hpp"
 #include "common_functors.hpp"
 #include <vector>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "test_macros.hpp"
 #include "test_container.hpp"
 #include <typeinfo>
diff --git a/test/nonhook_node.hpp b/test/nonhook_node.hpp
index e2c666e..7b1389e 100644
--- a/test/nonhook_node.hpp
+++ b/test/nonhook_node.hpp
@@ -20,7 +20,7 @@
 #include <boost/move/detail/to_raw_pointer.hpp>
 
 #include <boost/static_assert.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace boost{
 namespace intrusive{
diff --git a/test/slist_test.cpp b/test/slist_test.cpp
index 8a5362f..0124e1a 100644
--- a/test/slist_test.cpp
+++ b/test/slist_test.cpp
@@ -18,7 +18,7 @@
 #include "smart_ptr.hpp"
 #include "common_functors.hpp"
 #include <vector>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "test_macros.hpp"
 #include "test_container.hpp"
 #include <typeinfo>
diff --git a/test/stateful_value_traits_test.cpp b/test/stateful_value_traits_test.cpp
index c24c8fb..7b3d72a 100644
--- a/test/stateful_value_traits_test.cpp
+++ b/test/stateful_value_traits_test.cpp
@@ -13,7 +13,7 @@
 #include <boost/intrusive/slist.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/unordered_set.hpp>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
 #include <vector>
 
diff --git a/test/test_container.hpp b/test/test_container.hpp
index 6e98071..4920f71 100644
--- a/test/test_container.hpp
+++ b/test/test_container.hpp
@@ -13,7 +13,7 @@
 #ifndef BOOST_INTRUSIVE_TEST_CONTAINER_HPP
 #define BOOST_INTRUSIVE_TEST_CONTAINER_HPP
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/detail/simple_disposers.hpp>
 #include <boost/intrusive/detail/iterator.hpp>
diff --git a/test/unordered_multiset_test.cpp b/test/unordered_multiset_test.cpp
index af872b3..35fb84c 100644
--- a/test/unordered_multiset_test.cpp
+++ b/test/unordered_multiset_test.cpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <algorithm> //std::sort
 #include <set>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include "test_macros.hpp"
 #include "test_container.hpp"
diff --git a/test/unordered_set_test.cpp b/test/unordered_set_test.cpp
index 60e8d36..dab86dd 100644
--- a/test/unordered_set_test.cpp
+++ b/test/unordered_set_test.cpp
@@ -17,7 +17,7 @@
 #include "common_functors.hpp"
 #include <vector>
 #include <set>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "test_macros.hpp"
 #include "test_container.hpp"
 #include "unordered_test_common.hpp"
diff --git a/test/unordered_test.hpp b/test/unordered_test.hpp
index 29bd705..99d56f1 100644
--- a/test/unordered_test.hpp
+++ b/test/unordered_test.hpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <algorithm> //std::sort
 #include <set>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include "test_macros.hpp"
 #include "test_container.hpp"