From bc092404374519cbdcf817c541987701b04d1fb9 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 19 Dec 2017 17:48:18 +0000
Subject: [PATCH] Update paths for headers moved to different modules

Makes it easier to see dependencies.
---
 include/boost/functional/hash/detail/hash_float.hpp | 2 +-
 include/boost/functional/hash/extensions.hpp        | 2 +-
 include/boost/functional/hash/hash.hpp              | 2 +-
 include/boost/functional/hash/hash_fwd.hpp          | 6 +++---
 test/hash_built_in_array_test.cpp                   | 2 +-
 test/hash_complex_test.cpp                          | 2 +-
 test/hash_custom_test.cpp                           | 2 +-
 test/hash_deque_test.cpp                            | 2 +-
 test/hash_enum_test.cpp                             | 2 +-
 test/hash_float_test.hpp                            | 4 ++--
 test/hash_friend_test.cpp                           | 2 +-
 test/hash_function_pointer_test.cpp                 | 2 +-
 test/hash_fwd_test_1.cpp                            | 2 +-
 test/hash_fwd_test_2.cpp                            | 2 +-
 test/hash_global_namespace_test.cpp                 | 2 +-
 test/hash_list_test.cpp                             | 2 +-
 test/hash_map_test.cpp                              | 2 +-
 test/hash_no_ext_macro_1.cpp                        | 2 +-
 test/hash_no_ext_macro_2.cpp                        | 2 +-
 test/hash_number_test.cpp                           | 4 ++--
 test/hash_pointer_test.cpp                          | 2 +-
 test/hash_range_test.cpp                            | 2 +-
 test/hash_set_test.cpp                              | 2 +-
 test/hash_std_array_test.cpp                        | 2 +-
 test/hash_std_smart_ptr_test.cpp                    | 2 +-
 test/hash_std_tuple_test.cpp                        | 2 +-
 test/hash_string_test.cpp                           | 2 +-
 test/hash_type_index_test.cpp                       | 2 +-
 test/hash_value_array_test.cpp                      | 2 +-
 test/hash_vector_test.cpp                           | 2 +-
 test/link_ext_test.cpp                              | 2 +-
 test/link_no_ext_test.cpp                           | 2 +-
 32 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp
index 1816c57..fdb432c 100644
--- a/include/boost/functional/hash/detail/hash_float.hpp
+++ b/include/boost/functional/hash/detail/hash_float.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/functional/hash/detail/float_functions.hpp>
 #include <boost/functional/hash/detail/limits.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/integer/static_log2.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/assert.hpp>
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
index cb3c856..13202b8 100644
--- a/include/boost/functional/hash/extensions.hpp
+++ b/include/boost/functional/hash/extensions.hpp
@@ -20,7 +20,7 @@
 
 #include <boost/functional/hash/hash.hpp>
 #include <boost/detail/container_fwd.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index b461f5f..af859c6 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -23,7 +23,7 @@
 #include <boost/limits.hpp>
 #include <boost/type_traits/is_enum.hpp>
 #include <boost/type_traits/is_integral.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/cstdint.hpp>
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
diff --git a/include/boost/functional/hash/hash_fwd.hpp b/include/boost/functional/hash/hash_fwd.hpp
index 01fe012..a87c182 100644
--- a/include/boost/functional/hash/hash_fwd.hpp
+++ b/include/boost/functional/hash/hash_fwd.hpp
@@ -10,13 +10,13 @@
 #if !defined(BOOST_FUNCTIONAL_HASH_FWD_HPP)
 #define BOOST_FUNCTIONAL_HASH_FWD_HPP
 
-#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
+#include <cstddef>
+
 #if defined(BOOST_HAS_PRAGMA_ONCE)
 #pragma once
 #endif
 
-#include <cstddef>
-#include <boost/detail/workaround.hpp>
 
 namespace boost
 {
diff --git a/test/hash_built_in_array_test.cpp b/test/hash_built_in_array_test.cpp
index e2dfe99..6d59500 100644
--- a/test/hash_built_in_array_test.cpp
+++ b/test/hash_built_in_array_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_complex_test.cpp b/test/hash_complex_test.cpp
index 88f3833..0b119dc 100644
--- a/test/hash_complex_test.cpp
+++ b/test/hash_complex_test.cpp
@@ -17,7 +17,7 @@ int main() {}
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined(BOOST_MSVC)
 #pragma warning(disable:4244)   // conversion from 'unsigned long' to
diff --git a/test/hash_custom_test.cpp b/test/hash_custom_test.cpp
index 4f125ab..e942e49 100644
--- a/test/hash_custom_test.cpp
+++ b/test/hash_custom_test.cpp
@@ -49,7 +49,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_deque_test.cpp b/test/hash_deque_test.cpp
index 4d7f447..84c14a7 100644
--- a/test/hash_deque_test.cpp
+++ b/test/hash_deque_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_enum_test.cpp b/test/hash_enum_test.cpp
index 2872b43..ffcc255 100644
--- a/test/hash_enum_test.cpp
+++ b/test/hash_enum_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "./compile_time.hpp"
 
 namespace test {
diff --git a/test/hash_float_test.hpp b/test/hash_float_test.hpp
index 8c2a43a..793aab6 100644
--- a/test/hash_float_test.hpp
+++ b/test/hash_float_test.hpp
@@ -11,12 +11,12 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <cmath>
 #include <boost/functional/hash/detail/limits.hpp>
 #include <boost/functional/hash/detail/float_functions.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #include <iostream>
 
diff --git a/test/hash_friend_test.cpp b/test/hash_friend_test.cpp
index 4b75f8a..cfb6a2d 100644
--- a/test/hash_friend_test.cpp
+++ b/test/hash_friend_test.cpp
@@ -52,7 +52,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_function_pointer_test.cpp b/test/hash_function_pointer_test.cpp
index 50fedf7..5430c08 100644
--- a/test/hash_function_pointer_test.cpp
+++ b/test/hash_function_pointer_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "./compile_time.hpp"
 
 void void_func1() { static int x = 1; ++x; }
diff --git a/test/hash_fwd_test_1.cpp b/test/hash_fwd_test_1.cpp
index 68fdde2..572afe9 100644
--- a/test/hash_fwd_test_1.cpp
+++ b/test/hash_fwd_test_1.cpp
@@ -9,7 +9,7 @@
 
 #include "./hash_fwd_test.hpp"
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_HASH_TEST_STD_INCLUDES)
 
diff --git a/test/hash_fwd_test_2.cpp b/test/hash_fwd_test_2.cpp
index d4c1a32..44f07c4 100644
--- a/test/hash_fwd_test_2.cpp
+++ b/test/hash_fwd_test_2.cpp
@@ -15,7 +15,7 @@ int main() {}
 #else
 
 #include "./hash_fwd_test.hpp"
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 template <class T> void unused(T const&) {}
 
diff --git a/test/hash_global_namespace_test.cpp b/test/hash_global_namespace_test.cpp
index 7fc7bf6..dedcf3c 100644
--- a/test/hash_global_namespace_test.cpp
+++ b/test/hash_global_namespace_test.cpp
@@ -50,7 +50,7 @@ namespace boost
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_list_test.cpp b/test/hash_list_test.cpp
index a0f9716..1aac304 100644
--- a/test/hash_list_test.cpp
+++ b/test/hash_list_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_map_test.cpp b/test/hash_map_test.cpp
index 01a7854..750aa64 100644
--- a/test/hash_map_test.cpp
+++ b/test/hash_map_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <map>
 
diff --git a/test/hash_no_ext_macro_1.cpp b/test/hash_no_ext_macro_1.cpp
index d69e5b5..9c0f2fd 100644
--- a/test/hash_no_ext_macro_1.cpp
+++ b/test/hash_no_ext_macro_1.cpp
@@ -18,7 +18,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <deque>
 
 int main()
diff --git a/test/hash_no_ext_macro_2.cpp b/test/hash_no_ext_macro_2.cpp
index fe548ee..5e01e90 100644
--- a/test/hash_no_ext_macro_2.cpp
+++ b/test/hash_no_ext_macro_2.cpp
@@ -18,7 +18,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <map>
 
 int main()
diff --git a/test/hash_number_test.cpp b/test/hash_number_test.cpp
index 18756c3..2c36513 100644
--- a/test/hash_number_test.cpp
+++ b/test/hash_number_test.cpp
@@ -12,11 +12,11 @@
 #endif
 
 #include <iostream>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/functional/hash/detail/limits.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 
 #include "./compile_time.hpp"
 
diff --git a/test/hash_pointer_test.cpp b/test/hash_pointer_test.cpp
index 7cacaa8..b9e3f82 100644
--- a/test/hash_pointer_test.cpp
+++ b/test/hash_pointer_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/limits.hpp>
 #include "./compile_time.hpp"
 
diff --git a/test/hash_range_test.cpp b/test/hash_range_test.cpp
index a5bdbb6..68411de 100644
--- a/test/hash_range_test.cpp
+++ b/test/hash_range_test.cpp
@@ -17,7 +17,7 @@ int main() {}
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/limits.hpp>
 #include <vector>
 
diff --git a/test/hash_set_test.cpp b/test/hash_set_test.cpp
index 1cf9fef..b7f0099 100644
--- a/test/hash_set_test.cpp
+++ b/test/hash_set_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_std_array_test.cpp b/test/hash_std_array_test.cpp
index 2b240a3..6c1c59d 100644
--- a/test/hash_std_array_test.cpp
+++ b/test/hash_std_array_test.cpp
@@ -14,7 +14,7 @@
 #endif
 
 #include <boost/config.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_ARRAY)
 #define TEST_ARRAY
diff --git a/test/hash_std_smart_ptr_test.cpp b/test/hash_std_smart_ptr_test.cpp
index feb09d9..80983c8 100644
--- a/test/hash_std_smart_ptr_test.cpp
+++ b/test/hash_std_smart_ptr_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include "./compile_time.hpp"
 
 #if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_SMART_PTR)
diff --git a/test/hash_std_tuple_test.cpp b/test/hash_std_tuple_test.cpp
index 97bea99..6c770dd 100644
--- a/test/hash_std_tuple_test.cpp
+++ b/test/hash_std_tuple_test.cpp
@@ -14,7 +14,7 @@
 #endif
 
 #include <boost/config.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
 #define TEST_TUPLE
diff --git a/test/hash_string_test.cpp b/test/hash_string_test.cpp
index 7088d67..0d2c34e 100644
--- a/test/hash_string_test.cpp
+++ b/test/hash_string_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <string>
 #include "./compile_time.hpp"
 
diff --git a/test/hash_type_index_test.cpp b/test/hash_type_index_test.cpp
index 3288a5b..767d866 100644
--- a/test/hash_type_index_test.cpp
+++ b/test/hash_type_index_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash.hpp>
 #endif
 #include <boost/config.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
 
diff --git a/test/hash_value_array_test.cpp b/test/hash_value_array_test.cpp
index 58fc447..1264072 100644
--- a/test/hash_value_array_test.cpp
+++ b/test/hash_value_array_test.cpp
@@ -16,7 +16,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/hash_vector_test.cpp b/test/hash_vector_test.cpp
index 6dcf3b0..e084e42 100644
--- a/test/hash_vector_test.cpp
+++ b/test/hash_vector_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifdef BOOST_HASH_TEST_EXTENSIONS
 
diff --git a/test/link_ext_test.cpp b/test/link_ext_test.cpp
index 74a4eb5..915aa9b 100644
--- a/test/link_ext_test.cpp
+++ b/test/link_ext_test.cpp
@@ -7,7 +7,7 @@
 
 #define BOOST_HASH_TEST_NAMESPACE boost
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <vector>
 
 int f(std::size_t hash1, int* x1) {
diff --git a/test/link_no_ext_test.cpp b/test/link_no_ext_test.cpp
index 75cd47d..91472e2 100644
--- a/test/link_no_ext_test.cpp
+++ b/test/link_no_ext_test.cpp
@@ -8,7 +8,7 @@
 #define BOOST_HASH_TEST_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 extern int f(std::size_t, int*);