From bc092404374519cbdcf817c541987701b04d1fb9 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 19 Dec 2017 17:48:18 +0000 Subject: [PATCH 1/6] 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 #include -#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #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 +#include +#include + #if defined(BOOST_HAS_PRAGMA_ONCE) #pragma once #endif -#include -#include 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 +#include #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 #endif -#include +#include #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 +#include #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 +#include #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 #endif -#include +#include #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 #endif -#include +#include #include #include #include -#include +#include #include 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 +#include #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 #endif -#include +#include #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 +#include #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 +#include template 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 +#include #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 +#include #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 +#include #include 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 #endif -#include +#include #include 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 #endif -#include +#include #include 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 -#include +#include #include #include -#include +#include #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 #endif -#include +#include #include #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 #endif -#include +#include #include #include 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 +#include #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 -#include +#include #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 #endif -#include +#include #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 -#include +#include #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 #endif -#include +#include #include #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 #endif #include -#include +#include #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 +#include #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 +#include #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 -#include +#include #include 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 -#include +#include extern int f(std::size_t, int*); From 376000169c3c9c6bc3be4f119afab546b834d7bd Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 19 Dec 2017 17:48:18 +0000 Subject: [PATCH 2/6] Manually write out tuple overloads A tad more usable this way. --- include/boost/functional/hash/extensions.hpp | 73 ++++++++++++++++---- test/config.hpp | 4 ++ test/hash_map_test.hpp | 6 +- test/hash_number_test.cpp | 3 +- test/hash_sequence_test.hpp | 6 +- test/hash_set_test.hpp | 6 +- 6 files changed, 70 insertions(+), 28 deletions(-) diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp index 13202b8..b1eb199 100644 --- a/include/boost/functional/hash/extensions.hpp +++ b/include/boost/functional/hash/extensions.hpp @@ -5,7 +5,7 @@ // Based on Peter Dimov's proposal // http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf -// issue 6.18. +// issue 6.18. // This implements the extensions to the standard. // It's undocumented, so you shouldn't use it.... @@ -22,8 +22,6 @@ #include #include #include -#include -#include #if !defined(BOOST_NO_CXX11_HDR_ARRAY) # include @@ -171,19 +169,66 @@ namespace boost return boost::hash_detail::hash_tuple(v); } -# define BOOST_HASH_TUPLE_F(z, n, _) \ - template< \ - BOOST_PP_ENUM_PARAMS_Z(z, n, typename A) \ - > \ - inline std::size_t hash_value(std::tuple< \ - BOOST_PP_ENUM_PARAMS_Z(z, n, A) \ - > const& v) \ - { \ - return boost::hash_detail::hash_tuple(v); \ + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); + } + + template + inline std::size_t hash_value(std::tuple const& v) + { + return boost::hash_detail::hash_tuple(v); } - BOOST_PP_REPEAT_FROM_TO(1, 11, BOOST_HASH_TUPLE_F, _) -# undef BOOST_HASH_TUPLE_F #endif #endif diff --git a/test/config.hpp b/test/config.hpp index 53edf0a..28b28d4 100644 --- a/test/config.hpp +++ b/test/config.hpp @@ -18,4 +18,8 @@ // before doing anything else. #pragma warning(disable:4201) // nonstandard extension used : // nameless struct/union + #endif + +#define HASH_TEST_CAT(x, y) HASH_TEST_CAT2(x, y) +#define HASH_TEST_CAT2(x, y) x##y diff --git a/test/hash_map_test.hpp b/test/hash_map_test.hpp index 41bb2fa..95ca62c 100644 --- a/test/hash_map_test.hpp +++ b/test/hash_map_test.hpp @@ -7,15 +7,13 @@ #error "CONTAINER_TYPE not defined" #else -#include - #if defined(BOOST_MSVC) #pragma warning(push) #pragma warning(disable:4244) // conversion from 'int' to 'float' #pragma warning(disable:4245) // signed/unsigned mismatch #endif -namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) +namespace HASH_TEST_CAT(CONTAINER_TYPE, _tests) { template void integer_tests(T* = 0) @@ -59,7 +57,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) } } - void BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests()) + void HASH_TEST_CAT(CONTAINER_TYPE, _hash_integer_tests()) { integer_tests((CONTAINER_TYPE*) 0); integer_tests((CONTAINER_TYPE*) 0); diff --git a/test/hash_number_test.cpp b/test/hash_number_test.cpp index 2c36513..69fc633 100644 --- a/test/hash_number_test.cpp +++ b/test/hash_number_test.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include @@ -140,7 +139,7 @@ void bool_test() { BOOST_HASH_TEST_NAMESPACE::hash x1; BOOST_HASH_TEST_NAMESPACE::hash x2; - + BOOST_TEST(x1(true) == x2(true)); BOOST_TEST(x1(false) == x2(false)); BOOST_TEST(x1(true) != x2(false)); diff --git a/test/hash_sequence_test.hpp b/test/hash_sequence_test.hpp index 30083f9..3e915f8 100644 --- a/test/hash_sequence_test.hpp +++ b/test/hash_sequence_test.hpp @@ -7,14 +7,12 @@ #error "CONTAINER_TYPE not defined" #else -#include - #if defined(BOOST_MSVC) #pragma warning(push) #pragma warning(disable:4245) // signed/unsigned mismatch #endif -namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) +namespace HASH_TEST_CAT(CONTAINER_TYPE, _tests) { template void integer_tests(T* = 0) @@ -61,7 +59,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) } } - void BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests()) + void HASH_TEST_CAT(CONTAINER_TYPE, _hash_integer_tests()) { integer_tests((CONTAINER_TYPE*) 0); integer_tests((CONTAINER_TYPE*) 0); diff --git a/test/hash_set_test.hpp b/test/hash_set_test.hpp index 0a90330..9a77756 100644 --- a/test/hash_set_test.hpp +++ b/test/hash_set_test.hpp @@ -7,14 +7,12 @@ #error "CONTAINER_TYPE not defined" #else -#include - #if defined(BOOST_MSVC) #pragma warning(push) #pragma warning(disable:4245) // signed/unsigned mismatch #endif -namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) +namespace HASH_TEST_CAT(CONTAINER_TYPE, _tests) { template void integer_tests(T* = 0) @@ -64,7 +62,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests) } } - void BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests()) + void HASH_TEST_CAT(CONTAINER_TYPE, _hash_integer_tests()) { integer_tests((CONTAINER_TYPE*) 0); integer_tests((CONTAINER_TYPE*) 0); From fc3e0bff4fc2ddb871a0fae6bb50ccc076cd7e3e Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 28 Dec 2017 21:04:48 +0000 Subject: [PATCH 3/6] Add targets for automated doc build --- doc/Jamfile.v2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 044ee70..ecd2252 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -17,3 +17,9 @@ boostbook standalone : hash : toc.max.depth=1 pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/libs/functional/hash/doc/html ; + +############################################################################### + alias boostdoc : hash ; + explicit boostdoc ; + alias boostrelease ; + explicit boostrelease ; From c7fc03d2b9bfd01ec864fa1990e950afc078cd1e Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 28 Dec 2017 23:48:00 +0000 Subject: [PATCH 4/6] Rename library in explicit-failures-markup --- meta/explicit-failures-markup.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/explicit-failures-markup.xml b/meta/explicit-failures-markup.xml index 5f21dd0..7f94140 100644 --- a/meta/explicit-failures-markup.xml +++ b/meta/explicit-failures-markup.xml @@ -1,7 +1,7 @@ - - + + From 53fbb04e88cf08138be207694a4accc3f9aaaac1 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 29 Dec 2017 13:58:48 +0000 Subject: [PATCH 5/6] Move 'functional' headers and update paths --- doc/Jamfile.v2 | 2 +- doc/changes.qbk | 14 +++++++------- doc/disable.qbk | 2 +- doc/hash.qbk | 4 ++-- doc/portability.qbk | 2 +- doc/ref.xml | 8 ++++---- doc/tutorial.qbk | 14 +++++++------- examples/books.cpp | 2 +- examples/point.cpp | 2 +- examples/portable.cpp | 2 +- examples/template.hpp | 2 +- .../boost/{functional => container_hash}/hash.hpp | 2 +- .../hash/detail/float_functions.hpp | 0 .../hash/detail/hash_float.hpp | 4 ++-- .../hash/detail/limits.hpp | 0 .../hash/extensions.hpp | 2 +- .../{functional => container_hash}/hash/hash.hpp | 6 +++--- .../hash/hash_fwd.hpp | 0 .../{functional => container_hash}/hash_fwd.hpp | 2 +- meta/libraries.json | 6 +++--- test/Jamfile.v2 | 8 ++++---- test/extensions_hpp_test.cpp | 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 | 6 +++--- test/hash_friend_test.cpp | 2 +- test/hash_function_pointer_test.cpp | 2 +- test/hash_fwd_test.hpp | 2 +- test/hash_fwd_test_1.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_fail_test.cpp | 2 +- test/hash_no_ext_macro_1.cpp | 4 ++-- test/hash_no_ext_macro_2.cpp | 4 ++-- 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/implicit_test.cpp | 2 +- test/link_ext_test.cpp | 2 +- test/link_no_ext_test.cpp | 2 +- test/link_test.cpp | 2 +- test/link_test_2.cpp | 2 +- test/namespace_fail_test.cpp | 2 +- 55 files changed, 83 insertions(+), 83 deletions(-) rename include/boost/{functional => container_hash}/hash.hpp (80%) rename include/boost/{functional => container_hash}/hash/detail/float_functions.hpp (100%) rename include/boost/{functional => container_hash}/hash/detail/hash_float.hpp (98%) rename include/boost/{functional => container_hash}/hash/detail/limits.hpp (100%) rename include/boost/{functional => container_hash}/hash/extensions.hpp (99%) rename include/boost/{functional => container_hash}/hash/hash.hpp (99%) rename include/boost/{functional => container_hash}/hash/hash_fwd.hpp (100%) rename include/boost/{functional => container_hash}/hash_fwd.hpp (84%) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index ecd2252..3482448 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -15,7 +15,7 @@ boostbook standalone : hash : generate.section.toc.level=2 toc.section.depth=1 toc.max.depth=1 - pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/libs/functional/hash/doc/html + pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/libs/container_hash/hash/doc/html ; ############################################################################### diff --git a/doc/changes.qbk b/doc/changes.qbk index 37dd738..6cf74a8 100644 --- a/doc/changes.qbk +++ b/doc/changes.qbk @@ -19,8 +19,8 @@ * Use declarations for standard classes, so that the library doesn't need to include all of their headers -* Deprecated the `` headers. Now a single header, - <[headerref boost/functional/hash.hpp]> is used. +* Deprecated the `` headers. Now a single header, + <[headerref boost/container_hash/hash.hpp]> is used. * Add support for the `BOOST_HASH_NO_EXTENSIONS` macro, which disables the extensions to TR1. @@ -71,10 +71,10 @@ * Changed the warnings in the deprecated headers from 1.34.0 to errors. These will be removed in a future version of Boost. -* Moved detail headers out of `boost/functional/detail`, since they are part of - functional/hash, not functional. `boost/functional/detail/container_fwd.hpp` +* Moved detail headers out of `boost/container_hash/detail`, since they are part of + container_hash/hash, not container_hash. `boost/container_hash/detail/container_fwd.hpp` has been moved to `boost/detail/container_fwd.hpp` as it's used outside of - this library, the others have been moved to `boost/functional/hash/detail`. + this library, the others have been moved to `boost/container_hash/hash/detail`. [h2 Boost 1.39.0] @@ -132,7 +132,7 @@ * [@http://svn.boost.org/trac/boost/ticket/6806 Ticket 6806]: Support `std::array` and `std::tuple` when available. * Add deprecation warning to the long deprecated - `boost/functional/detail/container_fwd.hpp`. + `boost/container_hash/detail/container_fwd.hpp`. [h2 Boost 1.51.0] @@ -177,7 +177,7 @@ [h2 Boost 1.58.0] * Fixed strict aliasing violation - ([@https://github.com/boostorg/functional/pull/3 GitHub #3]). + ([@https://github.com/boostorg/container_hash/pull/3 GitHub #3]). [h2 Boost 1.63.0] diff --git a/doc/disable.qbk b/doc/disable.qbk index 27dec6b..5373b42 100644 --- a/doc/disable.qbk +++ b/doc/disable.qbk @@ -10,7 +10,7 @@ to turn them of in order to check that your code will work with other implementations of TR1. To do this define the macro `BOOST_HASH_NO_EXTENSIONS`. When this macro is defined, only the specialisations detailed in TR1 will be declared. But, if you later undefine the macro and include -<[headerref boost/functional/hash.hpp]> then the non-specialised form will be defined +<[headerref boost/container_hash/hash.hpp]> then the non-specialised form will be defined - activating the extensions. It is strongly recommended that you never undefine the macro - and only define diff --git a/doc/hash.qbk b/doc/hash.qbk index cdb72d4..3bcc80e 100644 --- a/doc/hash.qbk +++ b/doc/hash.qbk @@ -1,4 +1,4 @@ -[library Boost.Functional/Hash +[library Boost.ContainerHash [quickbook 1.5] [authors [James, Daniel]] [copyright 2005 2006 2007 2008 Daniel James] @@ -6,7 +6,7 @@ defined types] [category higher-order] [id hash] - [dirname functional/hash] + [dirname container_hash] [license Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/doc/portability.qbk b/doc/portability.qbk index a65bc19..7db3e56 100644 --- a/doc/portability.qbk +++ b/doc/portability.qbk @@ -88,6 +88,6 @@ boost namespace: } Full code for this example is at -[@boost:/libs/functional/hash/examples/portable.cpp /libs/functional/hash/examples/portable.cpp]. +[@boost:/libs/container_hash/hash/examples/portable.cpp /libs/container_hash/hash/examples/portable.cpp]. [endsect] diff --git a/doc/ref.xml b/doc/ref.xml index f5fd185..1c8bca9 100644 --- a/doc/ref.xml +++ b/doc/ref.xml @@ -13,7 +13,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) Library Extension Technical Report Issues List (page 63). -
+
Defines boost::hash, and helper functions. @@ -57,7 +57,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) Forward declared in - <boost/functional/hash_fwd.hpp> + <boost/container_hash/hash_fwd.hpp> This hash function is not intended for general use, and isn't @@ -542,7 +542,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) This is an extension to TR1 Forward declared in - <boost/functional/hash_fwd.hpp> + <boost/container_hash/hash_fwd.hpp> This hash function is not intended for general use, and isn't @@ -615,7 +615,7 @@ for(; first != last; ++first) This is an extension to TR1 Forward declared in - <boost/functional/hash_fwd.hpp> + <boost/container_hash/hash_fwd.hpp> This hash function is not intended for general use, and isn't diff --git a/doc/tutorial.qbk b/doc/tutorial.qbk index 59067a7..2c0d1f3 100644 --- a/doc/tutorial.qbk +++ b/doc/tutorial.qbk @@ -27,7 +27,7 @@ associative containers and you wish to use To use [classref boost::hash] directly, create an instance and call it as a function: - #include <``[headerref boost/functional/hash.hpp]``> + #include <``[headerref boost/container_hash/hash.hpp]``> int main() { @@ -110,9 +110,9 @@ And you can now use [classref boost::hash] with book: assert(books.find(dandelion) == books.end()); The full example can be found in: -[@boost:/libs/functional/hash/examples/books.hpp /libs/functional/hash/examples/books.hpp] +[@boost:/libs/container_hash/hash/examples/books.hpp /libs/container_hash/hash/examples/books.hpp] and -[@boost:/libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.cpp]. +[@boost:/libs/container_hash/hash/examples/books.cpp /libs/container_hash/hash/examples/books.cpp]. [tip When writing a hash function, first look at how the equality function works. @@ -170,7 +170,7 @@ of point, it can be repeatedly called for any number of elements. It calls [funcref boost::hash_value hash_value] on the supplied element, and combines it with the seed. Full code for this example is at -[@boost:/libs/functional/hash/examples/point.cpp /libs/functional/hash/examples/point.cpp]. +[@boost:/libs/container_hash/hash/examples/point.cpp /libs/container_hash/hash/examples/point.cpp]. [note When using [funcref boost::hash_combine] the order of the @@ -200,13 +200,13 @@ To calculate the hash of an iterator range you can use [funcref boost::hash_rang Note that when writing template classes, you might not want to include the main hash header as it's quite an expensive include that brings in a lot of other -headers, so instead you can include the `` +headers, so instead you can include the `` header which forward declares [classref boost::hash], [funcref boost::hash_range] and [funcref boost::hash_combine]. You'll need to include the main header before instantiating [classref boost::hash]. When using a container that uses [classref boost::hash] it should do that for you, so your type will work fine with the boost hash containers. There's an example of this -in [@boost:/libs/functional/hash/examples/template.hpp template.hpp] and -[@boost:/libs/functional/hash/examples/template.cpp template.cpp]. +in [@boost:/libs/container_hash/hash/examples/template.hpp template.hpp] and +[@boost:/libs/container_hash/hash/examples/template.cpp template.cpp]. [endsect] diff --git a/examples/books.cpp b/examples/books.cpp index 40feae3..3dfa547 100644 --- a/examples/books.cpp +++ b/examples/books.cpp @@ -4,7 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./books.hpp" -#include +#include #include // If std::unordered_set was available: diff --git a/examples/point.cpp b/examples/point.cpp index f3d30e1..3f5e8be 100644 --- a/examples/point.cpp +++ b/examples/point.cpp @@ -8,7 +8,7 @@ #undef NDEBUG #endif -#include +#include #include // This example illustrates how to use boost::hash_combine to generate a hash diff --git a/examples/portable.cpp b/examples/portable.cpp index 511133e..e0ea96a 100644 --- a/examples/portable.cpp +++ b/examples/portable.cpp @@ -8,7 +8,7 @@ #undef NDEBUG #endif -#include +#include #include // This example illustrates how to customise boost::hash portably, so that diff --git a/examples/template.hpp b/examples/template.hpp index b630704..0a2fe13 100644 --- a/examples/template.hpp +++ b/examples/template.hpp @@ -6,7 +6,7 @@ // This is an example of how to write a hash function for a template // class. -#include +#include template class my_pair diff --git a/include/boost/functional/hash.hpp b/include/boost/container_hash/hash.hpp similarity index 80% rename from include/boost/functional/hash.hpp rename to include/boost/container_hash/hash.hpp index 44983f1..4a06833 100644 --- a/include/boost/functional/hash.hpp +++ b/include/boost/container_hash/hash.hpp @@ -3,5 +3,5 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#include +#include diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/container_hash/hash/detail/float_functions.hpp similarity index 100% rename from include/boost/functional/hash/detail/float_functions.hpp rename to include/boost/container_hash/hash/detail/float_functions.hpp diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/container_hash/hash/detail/hash_float.hpp similarity index 98% rename from include/boost/functional/hash/detail/hash_float.hpp rename to include/boost/container_hash/hash/detail/hash_float.hpp index fdb432c..d0f7f55 100644 --- a/include/boost/functional/hash/detail/hash_float.hpp +++ b/include/boost/container_hash/hash/detail/hash_float.hpp @@ -11,8 +11,8 @@ #pragma once #endif -#include -#include +#include +#include #include #include #include diff --git a/include/boost/functional/hash/detail/limits.hpp b/include/boost/container_hash/hash/detail/limits.hpp similarity index 100% rename from include/boost/functional/hash/detail/limits.hpp rename to include/boost/container_hash/hash/detail/limits.hpp diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/container_hash/hash/extensions.hpp similarity index 99% rename from include/boost/functional/hash/extensions.hpp rename to include/boost/container_hash/hash/extensions.hpp index b1eb199..d8e34db 100644 --- a/include/boost/functional/hash/extensions.hpp +++ b/include/boost/container_hash/hash/extensions.hpp @@ -18,7 +18,7 @@ #pragma once #endif -#include +#include #include #include #include diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/container_hash/hash/hash.hpp similarity index 99% rename from include/boost/functional/hash/hash.hpp rename to include/boost/container_hash/hash/hash.hpp index af859c6..21296f3 100644 --- a/include/boost/functional/hash/hash.hpp +++ b/include/boost/container_hash/hash/hash.hpp @@ -16,9 +16,9 @@ #if !defined(BOOST_FUNCTIONAL_HASH_HASH_HPP) #define BOOST_FUNCTIONAL_HASH_HASH_HPP -#include +#include #include -#include +#include #include #include #include @@ -591,5 +591,5 @@ namespace boost #if !defined(BOOST_HASH_NO_EXTENSIONS) \ && !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP) -#include +#include #endif diff --git a/include/boost/functional/hash/hash_fwd.hpp b/include/boost/container_hash/hash/hash_fwd.hpp similarity index 100% rename from include/boost/functional/hash/hash_fwd.hpp rename to include/boost/container_hash/hash/hash_fwd.hpp diff --git a/include/boost/functional/hash_fwd.hpp b/include/boost/container_hash/hash_fwd.hpp similarity index 84% rename from include/boost/functional/hash_fwd.hpp rename to include/boost/container_hash/hash_fwd.hpp index eea9073..5ff4801 100644 --- a/include/boost/functional/hash_fwd.hpp +++ b/include/boost/container_hash/hash_fwd.hpp @@ -8,4 +8,4 @@ #pragma once #endif -#include +#include diff --git a/meta/libraries.json b/meta/libraries.json index 22473a4..b1b075b 100644 --- a/meta/libraries.json +++ b/meta/libraries.json @@ -2,14 +2,14 @@ { "key": "functional/hash", "boost-version": "1.33.0", - "name": "Functional/Hash", + "name": "Container Hash", "authors": [ "Daniel James" ], "maintainers": [ "Daniel James " ], - "description": "A TR1 hash function object that can be extended to hash user defined types.", + "description": "An STL-compatible hash function object that can be extended to hash user defined types.", "std": [ "tr1" ], @@ -17,4 +17,4 @@ "Function-objects" ] } -] \ No newline at end of file +] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 1da2da8..dd2b977 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -18,7 +18,7 @@ project hash-tests #darwin:on ; -test-suite functional/hash +test-suite container_hash/hash : [ compile check_float_funcs.cpp ] [ run hash_fwd_test_1.cpp ] @@ -56,7 +56,7 @@ test-suite functional/hash [ run hash_no_ext_macro_2.cpp ] ; -test-suite functional/hash_no_ext +test-suite container_hash/hash_no_ext : [ run hash_number_test.cpp : : : BOOST_HASH_NO_EXTENSIONS : no_ext_number_test ] [ run hash_pointer_test.cpp : : : BOOST_HASH_NO_EXTENSIONS : no_ext_pointer_test ] @@ -69,7 +69,7 @@ test-suite functional/hash_no_ext # Tests to see if the floating point hash is using the binary hash. # Not run normally because on some platforms these should fail. -test-suite functional/hash_no_generic_float +test-suite container_hash/hash_no_generic_float : [ run hash_float_test.cpp : : : BOOST_HASH_DETAIL_TEST_WITHOUT_GENERIC @@ -78,6 +78,6 @@ test-suite functional/hash_no_generic_float : : : BOOST_HASH_DETAIL_TEST_WITHOUT_GENERIC : hash_long_double_test_no_generic ] ; -explicit functional/hash_no_generic_float ; +explicit container_hash/hash_no_generic_float ; build-project ../examples ; diff --git a/test/extensions_hpp_test.cpp b/test/extensions_hpp_test.cpp index c27981a..54d1054 100644 --- a/test/extensions_hpp_test.cpp +++ b/test/extensions_hpp_test.cpp @@ -3,14 +3,14 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// Check that boost/functional/hash/extensions.hpp works okay. +// Check that boost/container_hash/hash/extensions.hpp works okay. // -// It probably should be in boost/functional/hash/detail, but since it isn't it +// It probably should be in boost/container_hash/hash/detail, but since it isn't it // should work. #include "./config.hpp" -#include +#include int main() { int x[2] = { 2, 3 }; diff --git a/test/hash_built_in_array_test.cpp b/test/hash_built_in_array_test.cpp index 6d59500..ac782c3 100644 --- a/test/hash_built_in_array_test.cpp +++ b/test/hash_built_in_array_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_complex_test.cpp b/test/hash_complex_test.cpp index 0b119dc..5ecacbf 100644 --- a/test/hash_complex_test.cpp +++ b/test/hash_complex_test.cpp @@ -14,7 +14,7 @@ int main() {} #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include diff --git a/test/hash_custom_test.cpp b/test/hash_custom_test.cpp index e942e49..a642f0e 100644 --- a/test/hash_custom_test.cpp +++ b/test/hash_custom_test.cpp @@ -45,7 +45,7 @@ namespace boost # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_deque_test.cpp b/test/hash_deque_test.cpp index 84c14a7..3b900b8 100644 --- a/test/hash_deque_test.cpp +++ b/test/hash_deque_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_enum_test.cpp b/test/hash_enum_test.cpp index ffcc255..3d725b7 100644 --- a/test/hash_enum_test.cpp +++ b/test/hash_enum_test.cpp @@ -8,7 +8,7 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include diff --git a/test/hash_float_test.hpp b/test/hash_float_test.hpp index 793aab6..a73c31f 100644 --- a/test/hash_float_test.hpp +++ b/test/hash_float_test.hpp @@ -8,14 +8,14 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include #include -#include -#include +#include +#include #include #include diff --git a/test/hash_friend_test.cpp b/test/hash_friend_test.cpp index cfb6a2d..60d172e 100644 --- a/test/hash_friend_test.cpp +++ b/test/hash_friend_test.cpp @@ -48,7 +48,7 @@ namespace boost # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_function_pointer_test.cpp b/test/hash_function_pointer_test.cpp index 5430c08..abc8c4a 100644 --- a/test/hash_function_pointer_test.cpp +++ b/test/hash_function_pointer_test.cpp @@ -8,7 +8,7 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include diff --git a/test/hash_fwd_test.hpp b/test/hash_fwd_test.hpp index d3c8186..76fce57 100644 --- a/test/hash_fwd_test.hpp +++ b/test/hash_fwd_test.hpp @@ -6,7 +6,7 @@ #include "./config.hpp" #if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_HASH_TEST_STD_INCLUDES) -#include +#include #include #include diff --git a/test/hash_fwd_test_1.cpp b/test/hash_fwd_test_1.cpp index 572afe9..70ab3c7 100644 --- a/test/hash_fwd_test_1.cpp +++ b/test/hash_fwd_test_1.cpp @@ -13,7 +13,7 @@ #if defined(BOOST_HASH_TEST_EXTENSIONS) && !defined(BOOST_HASH_TEST_STD_INCLUDES) -#include +#include #include void fwd_test1() diff --git a/test/hash_global_namespace_test.cpp b/test/hash_global_namespace_test.cpp index dedcf3c..6062ba9 100644 --- a/test/hash_global_namespace_test.cpp +++ b/test/hash_global_namespace_test.cpp @@ -46,7 +46,7 @@ namespace boost # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_list_test.cpp b/test/hash_list_test.cpp index 1aac304..9b2c25f 100644 --- a/test/hash_list_test.cpp +++ b/test/hash_list_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_map_test.cpp b/test/hash_map_test.cpp index 750aa64..b70a9be 100644 --- a/test/hash_map_test.cpp +++ b/test/hash_map_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_no_ext_fail_test.cpp b/test/hash_no_ext_fail_test.cpp index 6d1636e..ee35950 100644 --- a/test/hash_no_ext_fail_test.cpp +++ b/test/hash_no_ext_fail_test.cpp @@ -14,7 +14,7 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif template void ignore(T const&) {} diff --git a/test/hash_no_ext_macro_1.cpp b/test/hash_no_ext_macro_1.cpp index 9c0f2fd..1bfcb95 100644 --- a/test/hash_no_ext_macro_1.cpp +++ b/test/hash_no_ext_macro_1.cpp @@ -11,11 +11,11 @@ # if defined(BOOST_HASH_NO_EXTENSIONS) # undef BOOST_HASH_NO_EXTENSIONS # endif -# include +# include // Include header with BOOST_HASH_NO_EXTENSIONS defined # define BOOST_HASH_NO_EXTENSIONS -# include +# include #endif #include diff --git a/test/hash_no_ext_macro_2.cpp b/test/hash_no_ext_macro_2.cpp index 5e01e90..6f46018 100644 --- a/test/hash_no_ext_macro_2.cpp +++ b/test/hash_no_ext_macro_2.cpp @@ -11,11 +11,11 @@ # if !defined(BOOST_HASH_NO_EXTENSIONS) # define BOOST_HASH_NO_EXTENSIONS # endif -# include +# include // Include header without BOOST_HASH_NO_EXTENSIONS defined # undef BOOST_HASH_NO_EXTENSIONS -# include +# include #endif #include diff --git a/test/hash_number_test.cpp b/test/hash_number_test.cpp index 69fc633..c78783e 100644 --- a/test/hash_number_test.cpp +++ b/test/hash_number_test.cpp @@ -8,13 +8,13 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include #include -#include +#include #include #include "./compile_time.hpp" diff --git a/test/hash_pointer_test.cpp b/test/hash_pointer_test.cpp index b9e3f82..7086a61 100644 --- a/test/hash_pointer_test.cpp +++ b/test/hash_pointer_test.cpp @@ -8,7 +8,7 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include diff --git a/test/hash_range_test.cpp b/test/hash_range_test.cpp index 68411de..4a309e3 100644 --- a/test/hash_range_test.cpp +++ b/test/hash_range_test.cpp @@ -14,7 +14,7 @@ int main() {} #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include diff --git a/test/hash_set_test.cpp b/test/hash_set_test.cpp index b7f0099..48dcc2b 100644 --- a/test/hash_set_test.cpp +++ b/test/hash_set_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_std_array_test.cpp b/test/hash_std_array_test.cpp index 6c1c59d..d8faee4 100644 --- a/test/hash_std_array_test.cpp +++ b/test/hash_std_array_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_std_smart_ptr_test.cpp b/test/hash_std_smart_ptr_test.cpp index 80983c8..b8625fe 100644 --- a/test/hash_std_smart_ptr_test.cpp +++ b/test/hash_std_smart_ptr_test.cpp @@ -8,7 +8,7 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include diff --git a/test/hash_std_tuple_test.cpp b/test/hash_std_tuple_test.cpp index 6c770dd..df4ef37 100644 --- a/test/hash_std_tuple_test.cpp +++ b/test/hash_std_tuple_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_string_test.cpp b/test/hash_string_test.cpp index 0d2c34e..f84eb74 100644 --- a/test/hash_string_test.cpp +++ b/test/hash_string_test.cpp @@ -8,7 +8,7 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include diff --git a/test/hash_type_index_test.cpp b/test/hash_type_index_test.cpp index 767d866..f03750f 100644 --- a/test/hash_type_index_test.cpp +++ b/test/hash_type_index_test.cpp @@ -8,7 +8,7 @@ #ifdef BOOST_HASH_TEST_STD_INCLUDES # include #else -# include +# include #endif #include #include diff --git a/test/hash_value_array_test.cpp b/test/hash_value_array_test.cpp index 1264072..d0d7fe6 100644 --- a/test/hash_value_array_test.cpp +++ b/test/hash_value_array_test.cpp @@ -12,7 +12,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/hash_vector_test.cpp b/test/hash_vector_test.cpp index e084e42..752438f 100644 --- a/test/hash_vector_test.cpp +++ b/test/hash_vector_test.cpp @@ -9,7 +9,7 @@ # ifdef BOOST_HASH_TEST_STD_INCLUDES # include # else -# include +# include # endif #endif diff --git a/test/implicit_test.cpp b/test/implicit_test.cpp index e48bbcd..67859da 100644 --- a/test/implicit_test.cpp +++ b/test/implicit_test.cpp @@ -3,7 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#include +#include namespace test { diff --git a/test/link_ext_test.cpp b/test/link_ext_test.cpp index 915aa9b..de4964b 100644 --- a/test/link_ext_test.cpp +++ b/test/link_ext_test.cpp @@ -6,7 +6,7 @@ #include "./config.hpp" #define BOOST_HASH_TEST_NAMESPACE boost -#include +#include #include #include diff --git a/test/link_no_ext_test.cpp b/test/link_no_ext_test.cpp index 91472e2..b325bd6 100644 --- a/test/link_no_ext_test.cpp +++ b/test/link_no_ext_test.cpp @@ -7,7 +7,7 @@ #define BOOST_HASH_TEST_NAMESPACE boost #define BOOST_HASH_NO_EXTENSIONS -#include +#include #include extern int f(std::size_t, int*); diff --git a/test/link_test.cpp b/test/link_test.cpp index bdae262..4acc301 100644 --- a/test/link_test.cpp +++ b/test/link_test.cpp @@ -5,7 +5,7 @@ #include "./config.hpp" -#include +#include extern int f(); int main() { return f(); } diff --git a/test/link_test_2.cpp b/test/link_test_2.cpp index 1beffc8..ff50e52 100644 --- a/test/link_test_2.cpp +++ b/test/link_test_2.cpp @@ -5,6 +5,6 @@ #include "./config.hpp" -#include +#include int f() { return 0; } diff --git a/test/namespace_fail_test.cpp b/test/namespace_fail_test.cpp index 1db9fc6..700d074 100644 --- a/test/namespace_fail_test.cpp +++ b/test/namespace_fail_test.cpp @@ -9,7 +9,7 @@ #include "./config.hpp" #include -#include +#include typedef list foo; From 6ca88a814699fc680078b105982959ed076511a8 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 29 Dec 2017 14:12:03 +0000 Subject: [PATCH 6/6] Add forwarding headers at old locations --- include/boost/functional/hash.hpp | 6 ++++++ include/boost/functional/hash/extensions.hpp | 6 ++++++ include/boost/functional/hash/hash.hpp | 6 ++++++ include/boost/functional/hash/hash_fwd.hpp | 6 ++++++ include/boost/functional/hash_fwd.hpp | 6 ++++++ 5 files changed, 30 insertions(+) create mode 100644 include/boost/functional/hash.hpp create mode 100644 include/boost/functional/hash/extensions.hpp create mode 100644 include/boost/functional/hash/hash.hpp create mode 100644 include/boost/functional/hash/hash_fwd.hpp create mode 100644 include/boost/functional/hash_fwd.hpp diff --git a/include/boost/functional/hash.hpp b/include/boost/functional/hash.hpp new file mode 100644 index 0000000..6122b35 --- /dev/null +++ b/include/boost/functional/hash.hpp @@ -0,0 +1,6 @@ + +// Copyright 2005-2009 Daniel James. +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +#include diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp new file mode 100644 index 0000000..bd436fb --- /dev/null +++ b/include/boost/functional/hash/extensions.hpp @@ -0,0 +1,6 @@ + +// Copyright 2017 Daniel James. +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +#include diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp new file mode 100644 index 0000000..6122b35 --- /dev/null +++ b/include/boost/functional/hash/hash.hpp @@ -0,0 +1,6 @@ + +// Copyright 2005-2009 Daniel James. +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +#include diff --git a/include/boost/functional/hash/hash_fwd.hpp b/include/boost/functional/hash/hash_fwd.hpp new file mode 100644 index 0000000..aeffad0 --- /dev/null +++ b/include/boost/functional/hash/hash_fwd.hpp @@ -0,0 +1,6 @@ + +// Copyright 2005-2009 Daniel James. +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +#include diff --git a/include/boost/functional/hash_fwd.hpp b/include/boost/functional/hash_fwd.hpp new file mode 100644 index 0000000..aeffad0 --- /dev/null +++ b/include/boost/functional/hash_fwd.hpp @@ -0,0 +1,6 @@ + +// Copyright 2005-2009 Daniel James. +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +#include