From c72ab5c6c1ded7689633213c00ed9df680f3049c Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Mon, 4 Feb 2013 23:10:24 +0900
Subject: [PATCH] fix hash implementation

---
 sprout/bitset/bitset.hpp                       | 4 ++--
 sprout/functional/hash/hash_range.hpp          | 3 ++-
 sprout/functional/hash/sscrisk/cel/array.hpp   | 2 +-
 sprout/functional/hash/sscrisk/cel/utility.hpp | 2 +-
 sprout/iterator/distance.hpp                   | 2 +-
 sprout/numeric/accumulate.hpp                  | 4 ++--
 sprout/random/unique_seed.hpp                  | 2 +-
 sprout/utility/pair/pair.hpp                   | 3 ++-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sprout/bitset/bitset.hpp b/sprout/bitset/bitset.hpp
index bdae9193..3f17c38c 100644
--- a/sprout/bitset/bitset.hpp
+++ b/sprout/bitset/bitset.hpp
@@ -10,7 +10,7 @@
 #include <sprout/config.hpp>
 #include <sprout/container/traits.hpp>
 #include <sprout/iterator/index_iterator.hpp>
-#include <sprout/functional/hash/hash.hpp>
+#include <sprout/functional/hash.hpp>
 #include <sprout/algorithm/all_of.hpp>
 #include <sprout/algorithm/any_of.hpp>
 #include <sprout/algorithm/find_if.hpp>
@@ -641,7 +641,7 @@ namespace sprout {
 			}
 
 			SPROUT_CONSTEXPR std::size_t do_to_hash() const {
-				return sprout::hash_value(w_);
+				return sprout::to_hash(w_);
 			}
 		};
 
diff --git a/sprout/functional/hash/hash_range.hpp b/sprout/functional/hash/hash_range.hpp
index c11e1468..cec8d549 100644
--- a/sprout/functional/hash/hash_range.hpp
+++ b/sprout/functional/hash/hash_range.hpp
@@ -5,7 +5,8 @@
 #include <sprout/config.hpp>
 #include <sprout/functional/hash/hash_fwd.hpp>
 #include <sprout/functional/hash/hash_combine.hpp>
-#include <sprout/container/functions.hpp>
+#include <sprout/container/begin.hpp>
+#include <sprout/container/end.hpp>
 #include <sprout/numeric/accumulate.hpp>
 
 namespace sprout {
diff --git a/sprout/functional/hash/sscrisk/cel/array.hpp b/sprout/functional/hash/sscrisk/cel/array.hpp
index 36f60038..98573dff 100644
--- a/sprout/functional/hash/sscrisk/cel/array.hpp
+++ b/sprout/functional/hash/sscrisk/cel/array.hpp
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 #include <sprout/config.hpp>
-#include <sprout/functional/hash/hash.hpp>
+#include <sprout/functional/hash.hpp>
 #include <sscrisk/cel/array.hpp>
 
 namespace sprout {
diff --git a/sprout/functional/hash/sscrisk/cel/utility.hpp b/sprout/functional/hash/sscrisk/cel/utility.hpp
index 9faa8ea6..15919f75 100644
--- a/sprout/functional/hash/sscrisk/cel/utility.hpp
+++ b/sprout/functional/hash/sscrisk/cel/utility.hpp
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 #include <sprout/config.hpp>
-#include <sprout/functional/hash/hash.hpp>
+#include <sprout/functional/hash.hpp>
 #include <sscrisk/cel/utility.hpp>
 
 namespace sprout {
diff --git a/sprout/iterator/distance.hpp b/sprout/iterator/distance.hpp
index dce01f0b..f65e9404 100644
--- a/sprout/iterator/distance.hpp
+++ b/sprout/iterator/distance.hpp
@@ -6,7 +6,7 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/next.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 #include <sprout/adl/not_found.hpp>
 
 namespace sprout_adl {
diff --git a/sprout/numeric/accumulate.hpp b/sprout/numeric/accumulate.hpp
index 88f0999d..13941078 100644
--- a/sprout/numeric/accumulate.hpp
+++ b/sprout/numeric/accumulate.hpp
@@ -7,7 +7,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/iterator/type_traits/is_iterator.hpp>
 #include <sprout/functional/plus.hpp>
-#include <sprout/utility/pair.hpp>
+#include <sprout/utility/pair/pair.hpp>
 
 namespace sprout {
 	namespace detail {
@@ -52,7 +52,7 @@ namespace sprout {
 		template<typename InputIterator, typename T, typename BinaryOperation>
 		inline SPROUT_CONSTEXPR sprout::pair<InputIterator, T>
 		accumulate_impl_1(
-			sprout::pair<InputIterator, bool> const& current,
+			sprout::pair<InputIterator, T> const& current,
 			InputIterator last, BinaryOperation binary_op, typename std::iterator_traits<InputIterator>::difference_type n
 			)
 		{
diff --git a/sprout/random/unique_seed.hpp b/sprout/random/unique_seed.hpp
index 8fe965af..0de081e6 100644
--- a/sprout/random/unique_seed.hpp
+++ b/sprout/random/unique_seed.hpp
@@ -5,7 +5,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/array.hpp>
-#include <sprout/functional/hash/hash.hpp>
+#include <sprout/functional/hash.hpp>
 #include <sprout/preprocessor/unique_string.hpp>
 
 namespace sprout {
diff --git a/sprout/utility/pair/pair.hpp b/sprout/utility/pair/pair.hpp
index bf5a4a9b..edda5ef0 100644
--- a/sprout/utility/pair/pair.hpp
+++ b/sprout/utility/pair/pair.hpp
@@ -7,7 +7,8 @@
 #include <sprout/index_tuple.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/swap.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 
 namespace sprout {
 	// Copyright (C) 2011 RiSK (sscrisk)