From 60e877acc50e4bb2c22af1a62e2ef81a928b0572 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 11 Mar 2009 22:51:09 +0000 Subject: [PATCH] Merge hash and unordered changes. Remove deprecated headers, move hash_fwd.hpp into hash subdirectory. And several minor internal changes. Mostly minor internal details. Merged revisions 51262-51263,51407-51409,51504-51505,51644-51646,51667 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r51262 | danieljames | 2009-02-15 19:32:04 +0000 (Sun, 15 Feb 2009) | 1 line Use the new 'boost:' links for the hash, unordered and quickbook documentation. ........ r51263 | danieljames | 2009-02-15 19:32:19 +0000 (Sun, 15 Feb 2009) | 2 lines Don't copy images for the standalone hash and unordered documentation, was only really required before the libraries were integrated into boost. ........ r51407 | danieljames | 2009-02-22 23:49:51 +0000 (Sun, 22 Feb 2009) | 1 line Fix the hash dirname. ........ r51408 | danieljames | 2009-02-22 23:50:04 +0000 (Sun, 22 Feb 2009) | 1 line Make copy_buckets and move_buckets member functions - so that calling them is a bit simpler. ........ r51409 | danieljames | 2009-02-22 23:50:20 +0000 (Sun, 22 Feb 2009) | 1 line Move some of the data structure classes out of hash table data. ........ r51504 | danieljames | 2009-03-01 14:15:09 +0000 (Sun, 01 Mar 2009) | 1 line Add missing return for operator=. ........ r51505 | danieljames | 2009-03-01 14:15:39 +0000 (Sun, 01 Mar 2009) | 3 lines Make the sort stable. Doesn't really matter, but it might as well be. ........ r51644 | danieljames | 2009-03-08 09:44:51 +0000 (Sun, 08 Mar 2009) | 1 line Detab. ........ r51645 | danieljames | 2009-03-08 09:45:11 +0000 (Sun, 08 Mar 2009) | 4 lines Move hash_fwd into the hash subdirectory. I should have done this in the last release. But now all of the hash implementation is in the hash subdirectory. ........ r51646 | danieljames | 2009-03-08 09:45:30 +0000 (Sun, 08 Mar 2009) | 3 lines Remove deprecated headers. Fixes #2412. ........ r51667 | danieljames | 2009-03-09 20:56:23 +0000 (Mon, 09 Mar 2009) | 1 line Update copyright dates in hash and unordered. ........ [SVN r51729] --- hash/doc/Jamfile.v2 | 17 ++------ hash/doc/hash.qbk | 2 +- hash/doc/intro.qbk | 6 +-- hash/doc/portability.qbk | 2 +- hash/doc/ref.xml | 2 +- hash/doc/tutorial.qbk | 8 ++-- hash/examples/books.cpp | 2 +- hash/examples/books.hpp | 2 +- hash/examples/portable.cpp | 2 +- hash/test/Jamfile.v2 | 1 - hash/test/compile_time.hpp | 2 +- hash/test/config.hpp | 2 +- hash/test/container_fwd_test.cpp | 2 +- hash/test/hash_built_in_array_test.cpp | 2 +- hash/test/hash_complex_test.cpp | 2 +- hash/test/hash_custom_test.cpp | 2 +- hash/test/hash_deprecated_headers.cpp | 26 ------------ hash/test/hash_deque_test.cpp | 2 +- hash/test/hash_float_test.cpp | 2 +- hash/test/hash_float_test.hpp | 2 +- hash/test/hash_friend_test.cpp | 2 +- hash/test/hash_function_pointer_test.cpp | 2 +- hash/test/hash_fwd_test.hpp | 2 +- hash/test/hash_fwd_test_1.cpp | 2 +- hash/test/hash_fwd_test_2.cpp | 2 +- hash/test/hash_global_namespace_test.cpp | 2 +- hash/test/hash_list_test.cpp | 2 +- hash/test/hash_long_double_test.cpp | 2 +- hash/test/hash_map_test.cpp | 2 +- hash/test/hash_map_test.hpp | 2 +- hash/test/hash_no_ext_fail_test.cpp | 2 +- hash/test/hash_no_ext_macro_1.cpp | 2 +- hash/test/hash_no_ext_macro_2.cpp | 2 +- hash/test/hash_number_test.cpp | 2 +- hash/test/hash_pointer_test.cpp | 2 +- hash/test/hash_range_test.cpp | 2 +- hash/test/hash_sequence_test.hpp | 2 +- hash/test/hash_set_test.cpp | 2 +- hash/test/hash_set_test.hpp | 2 +- hash/test/hash_string_test.cpp | 2 +- hash/test/hash_value_array_test.cpp | 2 +- hash/test/hash_vector_test.cpp | 2 +- hash/test/link_ext_test.cpp | 2 +- hash/test/link_no_ext_test.cpp | 2 +- hash/test/link_test.cpp | 2 +- hash/test/link_test_2.cpp | 2 +- include/boost/functional/hash.hpp | 6 +-- include/boost/functional/hash/deque.hpp | 7 ---- .../hash/detail/float_functions.hpp | 2 +- .../functional/hash/detail/hash_float.hpp | 6 +-- include/boost/functional/hash/extensions.hpp | 2 +- include/boost/functional/hash/hash.hpp | 4 +- include/boost/functional/hash/hash_fwd.hpp | 40 +++++++++++++++++++ include/boost/functional/hash/list.hpp | 7 ---- include/boost/functional/hash/map.hpp | 7 ---- include/boost/functional/hash/pair.hpp | 7 ---- include/boost/functional/hash/set.hpp | 7 ---- include/boost/functional/hash/vector.hpp | 7 ---- include/boost/functional/hash_fwd.hpp | 37 +---------------- 59 files changed, 99 insertions(+), 180 deletions(-) delete mode 100644 hash/test/hash_deprecated_headers.cpp delete mode 100644 include/boost/functional/hash/deque.hpp create mode 100644 include/boost/functional/hash/hash_fwd.hpp delete mode 100644 include/boost/functional/hash/list.hpp delete mode 100644 include/boost/functional/hash/map.hpp delete mode 100644 include/boost/functional/hash/pair.hpp delete mode 100644 include/boost/functional/hash/set.hpp delete mode 100644 include/boost/functional/hash/vector.hpp diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2 index 709e49a..acdf5ec 100644 --- a/hash/doc/Jamfile.v2 +++ b/hash/doc/Jamfile.v2 @@ -5,26 +5,15 @@ xml hash : hash.qbk ; boostbook standalone : hash : - html:admon.graphics.path=images/ - navig.graphics.path=images/ - html.stylesheet=boostbook.css + html.stylesheet=../../../../../doc/html/boostbook.css boost.root=../../../../.. boost.libraries=../../../../libraries.htm + navig.graphics=1 + chunk.first.sections=1 chunk.section.depth=2 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 - - css - images ; - -install css : [ glob $(BOOST_ROOT)/doc/src/*.css ] - : html ; -install images : [ glob $(BOOST_ROOT)/doc/src/images/*.png ] - : html/images ; -explicit css ; -explicit images ; - diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk index 39d6d97..b734fb4 100644 --- a/hash/doc/hash.qbk +++ b/hash/doc/hash.qbk @@ -6,7 +6,7 @@ defined types] [category higher-order] [id hash] - [dirname hash] + [dirname functional/hash] [license Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/hash/doc/intro.qbk b/hash/doc/intro.qbk index bba5de3..b027719 100644 --- a/hash/doc/intro.qbk +++ b/hash/doc/intro.qbk @@ -13,11 +13,11 @@ TR1]] [def __unordered__ [link unordered Boost.Unordered]] [def __intrusive__ [link intrusive.unordered_set_unordered_multiset Boost.Intrusive]] -[def __multi-index__ [@../../libs/multi_index/doc/index.html +[def __multi-index__ [@boost:/libs/multi_index/doc/index.html Boost Multi-Index Containers Library]] -[def __multi-index-short__ [@../../libs/multi_index/doc/index.html +[def __multi-index-short__ [@boost:/libs/multi_index/doc/index.html Boost.MultiIndex]] -[def __bimap__ [@../../libs/bimap/index.html Boost.Bimap]] +[def __bimap__ [@boost:/libs/bimap/index.html Boost.Bimap]] [def __issues__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1837.pdf Library Extension Technical Report Issues List]] diff --git a/hash/doc/portability.qbk b/hash/doc/portability.qbk index e9100ce..fabb298 100644 --- a/hash/doc/portability.qbk +++ b/hash/doc/portability.qbk @@ -88,7 +88,7 @@ boost namespace: } Full code for this example is at -[@../../libs/functional/hash/examples/portable.cpp /libs/functional/hash/examples/portable.cpp]. +[@boost:/libs/functional/hash/examples/portable.cpp /libs/functional/hash/examples/portable.cpp]. [h2 Other Issues] diff --git a/hash/doc/ref.xml b/hash/doc/ref.xml index 6bb32ce..1fe97d3 100644 --- a/hash/doc/ref.xml +++ b/hash/doc/ref.xml @@ -1,6 +1,6 @@ diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk index eaf9a95..b2f79f5 100644 --- a/hash/doc/tutorial.qbk +++ b/hash/doc/tutorial.qbk @@ -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) ] -[def __multi-index-short__ [@../../libs/multi_index/doc/index.html +[def __multi-index-short__ [@boost:/libs/multi_index/doc/index.html Boost.MultiIndex]] [section:tutorial Tutorial] @@ -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: -[@../../libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.hpp] +[@boost:/libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.hpp] and -[@../../libs/functional/hash/examples/books.cpp /libs/functional/hash/examples/books.cpp]. +[@boost:/libs/functional/hash/examples/books.cpp /libs/functional/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 -[@../../libs/functional/hash/examples/point.cpp /libs/functional/hash/examples/point.cpp]. +[@boost:/libs/functional/hash/examples/point.cpp /libs/functional/hash/examples/point.cpp]. [note When using [funcref boost::hash_combine] the order of the diff --git a/hash/examples/books.cpp b/hash/examples/books.cpp index 2615564..d54b353 100644 --- a/hash/examples/books.cpp +++ b/hash/examples/books.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/examples/books.hpp b/hash/examples/books.hpp index c0cf414..ac87a9d 100644 --- a/hash/examples/books.hpp +++ b/hash/examples/books.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/examples/portable.cpp b/hash/examples/portable.cpp index 98026c1..88f2fc7 100644 --- a/hash/examples/portable.cpp +++ b/hash/examples/portable.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2 index 2f771b3..ff149a7 100644 --- a/hash/test/Jamfile.v2 +++ b/hash/test/Jamfile.v2 @@ -40,7 +40,6 @@ test-suite functional/hash [ compile-fail hash_no_ext_fail_test.cpp ] [ run hash_no_ext_macro_1.cpp ] [ run hash_no_ext_macro_2.cpp ] - [ compile-fail hash_deprecated_headers.cpp ] ; build-project ../examples ; diff --git a/hash/test/compile_time.hpp b/hash/test/compile_time.hpp index 873df13..bd86038 100644 --- a/hash/test/compile_time.hpp +++ b/hash/test/compile_time.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/config.hpp b/hash/test/config.hpp index 9ef55b7..0f84cc7 100644 --- a/hash/test/config.hpp +++ b/hash/test/config.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp index bae96c7..87f5b90 100644 --- a/hash/test/container_fwd_test.cpp +++ b/hash/test/container_fwd_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp index 3d17f28..9c91799 100644 --- a/hash/test/hash_built_in_array_test.cpp +++ b/hash/test/hash_built_in_array_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp index e941fdd..dd519c9 100644 --- a/hash/test/hash_complex_test.cpp +++ b/hash/test/hash_complex_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp index 09e8ad8..9943d0c 100644 --- a/hash/test/hash_custom_test.cpp +++ b/hash/test/hash_custom_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_deprecated_headers.cpp b/hash/test/hash_deprecated_headers.cpp deleted file mode 100644 index 6a97e70..0000000 --- a/hash/test/hash_deprecated_headers.cpp +++ /dev/null @@ -1,26 +0,0 @@ - -// Copyright 2007-2008 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) - -// All these headers are meant output a warning, but not cause the compilation -// to fail. - -#include -#include -#include -#include -#include -#include - -// And a quick check that the hash library was included. -// Strictly speaking I should do this once for each header -// but that would just be wasting the testing resources. - -#include - -int main() { - std::vector v; - boost::hash > x; - x(v); -} diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp index 78841f8..bfb2691 100644 --- a/hash/test/hash_deque_test.cpp +++ b/hash/test/hash_deque_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp index c23365d..2490f8d 100644 --- a/hash/test/hash_float_test.cpp +++ b/hash/test/hash_float_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_float_test.hpp b/hash/test/hash_float_test.hpp index 2ef3a86..eef49b2 100644 --- a/hash/test/hash_float_test.hpp +++ b/hash/test/hash_float_test.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp index 8f005e6..cac4c7f 100644 --- a/hash/test/hash_friend_test.cpp +++ b/hash/test/hash_friend_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp index c171535..7fa4c89 100644 --- a/hash/test/hash_function_pointer_test.cpp +++ b/hash/test/hash_function_pointer_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_fwd_test.hpp b/hash/test/hash_fwd_test.hpp index 4822510..2438abf 100644 --- a/hash/test/hash_fwd_test.hpp +++ b/hash/test/hash_fwd_test.hpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp index f9dfadb..e9a1cd8 100644 --- a/hash/test/hash_fwd_test_1.cpp +++ b/hash/test/hash_fwd_test_1.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp index 24ccc95..bfa701d 100644 --- a/hash/test/hash_fwd_test_2.cpp +++ b/hash/test/hash_fwd_test_2.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp index eafd22b..a45278c 100644 --- a/hash/test/hash_global_namespace_test.cpp +++ b/hash/test/hash_global_namespace_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp index 0fd2bc5..30560d3 100644 --- a/hash/test/hash_list_test.cpp +++ b/hash/test/hash_list_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_long_double_test.cpp b/hash/test/hash_long_double_test.cpp index d4cbfce..860a679 100644 --- a/hash/test/hash_long_double_test.cpp +++ b/hash/test/hash_long_double_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp index 2ee6bc1..2f813c3 100644 --- a/hash/test/hash_map_test.cpp +++ b/hash/test/hash_map_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp index bb03279..3b52a50 100644 --- a/hash/test/hash_map_test.hpp +++ b/hash/test/hash_map_test.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp index 3959738..ef7ae96 100644 --- a/hash/test/hash_no_ext_fail_test.cpp +++ b/hash/test/hash_no_ext_fail_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp index db2e580..640c36a 100644 --- a/hash/test/hash_no_ext_macro_1.cpp +++ b/hash/test/hash_no_ext_macro_1.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp index dbeb68d..2f53779 100644 --- a/hash/test/hash_no_ext_macro_2.cpp +++ b/hash/test/hash_no_ext_macro_2.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp index ef97e99..1000258 100644 --- a/hash/test/hash_number_test.cpp +++ b/hash/test/hash_number_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp index 673f67a..5fcbc27 100644 --- a/hash/test/hash_pointer_test.cpp +++ b/hash/test/hash_pointer_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp index aac819b..66aad26 100644 --- a/hash/test/hash_range_test.cpp +++ b/hash/test/hash_range_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp index ad5b5df..4093bc4 100644 --- a/hash/test/hash_sequence_test.hpp +++ b/hash/test/hash_sequence_test.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp index 538c4fd..8b5463d 100644 --- a/hash/test/hash_set_test.cpp +++ b/hash/test/hash_set_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp index 2184d47..2a60781 100644 --- a/hash/test/hash_set_test.hpp +++ b/hash/test/hash_set_test.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp index b58ec18..85f5a0d 100644 --- a/hash/test/hash_string_test.cpp +++ b/hash/test/hash_string_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp index c39e9f1..75dfd4f 100644 --- a/hash/test/hash_value_array_test.cpp +++ b/hash/test/hash_value_array_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp index 5d8ff50..de02fe8 100644 --- a/hash/test/hash_vector_test.cpp +++ b/hash/test/hash_vector_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp index 936cab6..ca4c8f3 100644 --- a/hash/test/link_ext_test.cpp +++ b/hash/test/link_ext_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2006-2008 Daniel James. +// Copyright 2006-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) diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp index 22b03fa..7f46984 100644 --- a/hash/test/link_no_ext_test.cpp +++ b/hash/test/link_no_ext_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/link_test.cpp b/hash/test/link_test.cpp index 2819e05..37f9ee1 100644 --- a/hash/test/link_test.cpp +++ b/hash/test/link_test.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/hash/test/link_test_2.cpp b/hash/test/link_test_2.cpp index 8be1635..f32065c 100644 --- a/hash/test/link_test_2.cpp +++ b/hash/test/link_test_2.cpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/include/boost/functional/hash.hpp b/include/boost/functional/hash.hpp index 46b611b..44983f1 100644 --- a/include/boost/functional/hash.hpp +++ b/include/boost/functional/hash.hpp @@ -1,11 +1,7 @@ -// Copyright 2005-2008 Daniel James. +// 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) -// Based on Peter Dimov's proposal -// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf -// issue 6.18. - #include diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp deleted file mode 100644 index 0dd8b99..0000000 --- a/include/boost/functional/hash/deque.hpp +++ /dev/null @@ -1,7 +0,0 @@ - -// Copyright 2005-2008 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) - -#error "boost/functional/hash/deque.hpp is no longer supported, use boost/functional/hash.hpp instead." -#include diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/functional/hash/detail/float_functions.hpp index 154bab7..074b64f 100644 --- a/include/boost/functional/hash/detail/float_functions.hpp +++ b/include/boost/functional/hash/detail/float_functions.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/include/boost/functional/hash/detail/hash_float.hpp b/include/boost/functional/hash/detail/hash_float.hpp index ca449da..5d5ac34 100644 --- a/include/boost/functional/hash/detail/hash_float.hpp +++ b/include/boost/functional/hash/detail/hash_float.hpp @@ -1,12 +1,8 @@ -// Copyright 2005-2008 Daniel James. +// 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) -// Based on Peter Dimov's proposal -// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf -// issue 6.18. - #if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_HEADER) #define BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_HEADER diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp index b9d868e..d173314 100644 --- a/include/boost/functional/hash/extensions.hpp +++ b/include/boost/functional/hash/extensions.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp index b789ad6..67284fc 100644 --- a/include/boost/functional/hash/hash.hpp +++ b/include/boost/functional/hash/hash.hpp @@ -1,5 +1,5 @@ -// Copyright 2005-2008 Daniel James. +// 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) @@ -10,7 +10,7 @@ #if !defined(BOOST_FUNCTIONAL_HASH_HASH_HPP) #define BOOST_FUNCTIONAL_HASH_HASH_HPP -#include +#include #include #include #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..1d51b07 --- /dev/null +++ b/include/boost/functional/hash/hash_fwd.hpp @@ -0,0 +1,40 @@ + +// 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) + +// Based on Peter Dimov's proposal +// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf +// issue 6.18. + +#if !defined(BOOST_FUNCTIONAL_HASH_FWD_HPP) +#define BOOST_FUNCTIONAL_HASH_FWD_HPP + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +# pragma once +#endif + +#include +#include +#include + +namespace boost +{ + template struct hash; + +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) + template void hash_combine(std::size_t& seed, T& v); +#else + template void hash_combine(std::size_t& seed, T const& v); +#endif + + template std::size_t hash_range(It, It); + template void hash_range(std::size_t&, It, It); + +#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) + template inline std::size_t hash_range(T*, T*); + template inline void hash_range(std::size_t&, T*, T*); +#endif +} + +#endif diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp deleted file mode 100644 index 61e7b6d..0000000 --- a/include/boost/functional/hash/list.hpp +++ /dev/null @@ -1,7 +0,0 @@ - -// Copyright 2005-2008 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) - -#error "boost/functional/hash/list.hpp is no longer supported, use boost/functional/hash.hpp instead." -#include diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp deleted file mode 100644 index 2dcd58b..0000000 --- a/include/boost/functional/hash/map.hpp +++ /dev/null @@ -1,7 +0,0 @@ - -// Copyright 2005-2008 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) - -#error "boost/functional/hash/map.hpp is no longer supported, use boost/functional/hash.hpp instead." -#include diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp deleted file mode 100644 index d771460..0000000 --- a/include/boost/functional/hash/pair.hpp +++ /dev/null @@ -1,7 +0,0 @@ - -// Copyright 2005-2008 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) - -#error "boost/functional/hash/pair.hpp is no longer supported, use boost/functional/hash.hpp instead." -#include diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp deleted file mode 100644 index e85f80d..0000000 --- a/include/boost/functional/hash/set.hpp +++ /dev/null @@ -1,7 +0,0 @@ - -// Copyright 2005-2008 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) - -#error "boost/functional/hash/set.hpp is no longer supported, use boost/functional/hash.hpp instead." -#include diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp deleted file mode 100644 index 7fe2be6..0000000 --- a/include/boost/functional/hash/vector.hpp +++ /dev/null @@ -1,7 +0,0 @@ - -// Copyright 2005-2008 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) - -#error "boost/functional/hash/vector.hpp is no longer supported, use boost/functional/hash.hpp instead." -#include diff --git a/include/boost/functional/hash_fwd.hpp b/include/boost/functional/hash_fwd.hpp index 8b7d8e5..b640988 100644 --- a/include/boost/functional/hash_fwd.hpp +++ b/include/boost/functional/hash_fwd.hpp @@ -1,40 +1,7 @@ -// Copyright 2005-2008 Daniel James. +// 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) -// Based on Peter Dimov's proposal -// http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf -// issue 6.18. +#include -#if !defined(BOOST_FUNCTIONAL_HASH_FWD_HPP) -#define BOOST_FUNCTIONAL_HASH_FWD_HPP - -#if defined(_MSC_VER) && (_MSC_VER >= 1020) -# pragma once -#endif - -#include -#include -#include - -namespace boost -{ - template struct hash; - -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - template void hash_combine(std::size_t& seed, T& v); -#else - template void hash_combine(std::size_t& seed, T const& v); -#endif - - template std::size_t hash_range(It, It); - template void hash_range(std::size_t&, It, It); - -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) - template inline std::size_t hash_range(T*, T*); - template inline void hash_range(std::size_t&, T*, T*); -#endif -} - -#endif