fix hash implementation

This commit is contained in:
bolero-MURAKAMI 2013-02-04 23:10:24 +09:00
parent 6e5f4c5606
commit c72ab5c6c1
8 changed files with 12 additions and 10 deletions

View file

@ -10,7 +10,7 @@
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/container/traits.hpp> #include <sprout/container/traits.hpp>
#include <sprout/iterator/index_iterator.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/all_of.hpp>
#include <sprout/algorithm/any_of.hpp> #include <sprout/algorithm/any_of.hpp>
#include <sprout/algorithm/find_if.hpp> #include <sprout/algorithm/find_if.hpp>
@ -641,7 +641,7 @@ namespace sprout {
} }
SPROUT_CONSTEXPR std::size_t do_to_hash() const { SPROUT_CONSTEXPR std::size_t do_to_hash() const {
return sprout::hash_value(w_); return sprout::to_hash(w_);
} }
}; };

View file

@ -5,7 +5,8 @@
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/functional/hash/hash_fwd.hpp> #include <sprout/functional/hash/hash_fwd.hpp>
#include <sprout/functional/hash/hash_combine.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> #include <sprout/numeric/accumulate.hpp>
namespace sprout { namespace sprout {

View file

@ -3,7 +3,7 @@
#include <cstddef> #include <cstddef>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/functional/hash/hash.hpp> #include <sprout/functional/hash.hpp>
#include <sscrisk/cel/array.hpp> #include <sscrisk/cel/array.hpp>
namespace sprout { namespace sprout {

View file

@ -3,7 +3,7 @@
#include <cstddef> #include <cstddef>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/functional/hash/hash.hpp> #include <sprout/functional/hash.hpp>
#include <sscrisk/cel/utility.hpp> #include <sscrisk/cel/utility.hpp>
namespace sprout { namespace sprout {

View file

@ -6,7 +6,7 @@
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/iterator/next.hpp> #include <sprout/iterator/next.hpp>
#include <sprout/iterator/type_traits/is_iterator.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> #include <sprout/adl/not_found.hpp>
namespace sprout_adl { namespace sprout_adl {

View file

@ -7,7 +7,7 @@
#include <sprout/iterator/operation.hpp> #include <sprout/iterator/operation.hpp>
#include <sprout/iterator/type_traits/is_iterator.hpp> #include <sprout/iterator/type_traits/is_iterator.hpp>
#include <sprout/functional/plus.hpp> #include <sprout/functional/plus.hpp>
#include <sprout/utility/pair.hpp> #include <sprout/utility/pair/pair.hpp>
namespace sprout { namespace sprout {
namespace detail { namespace detail {
@ -52,7 +52,7 @@ namespace sprout {
template<typename InputIterator, typename T, typename BinaryOperation> template<typename InputIterator, typename T, typename BinaryOperation>
inline SPROUT_CONSTEXPR sprout::pair<InputIterator, T> inline SPROUT_CONSTEXPR sprout::pair<InputIterator, T>
accumulate_impl_1( 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 InputIterator last, BinaryOperation binary_op, typename std::iterator_traits<InputIterator>::difference_type n
) )
{ {

View file

@ -5,7 +5,7 @@
#include <type_traits> #include <type_traits>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/array.hpp> #include <sprout/array.hpp>
#include <sprout/functional/hash/hash.hpp> #include <sprout/functional/hash.hpp>
#include <sprout/preprocessor/unique_string.hpp> #include <sprout/preprocessor/unique_string.hpp>
namespace sprout { namespace sprout {

View file

@ -7,7 +7,8 @@
#include <sprout/index_tuple.hpp> #include <sprout/index_tuple.hpp>
#include <sprout/utility/forward.hpp> #include <sprout/utility/forward.hpp>
#include <sprout/utility/swap.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 { namespace sprout {
// Copyright (C) 2011 RiSK (sscrisk) // Copyright (C) 2011 RiSK (sscrisk)