[Boost-commit] svn:boost r42231 - in branches/unordered/dev: boost/unordered/detail libs/unordered/test/unordered

From: daniel_james_at_[hidden]
Date: 2007-12-21 07:04:52

Author: danieljames
Date: 2007-12-21 07:04:52 EST (Fri, 21 Dec 2007)
New Revision: 42231
URL: http://svn.boost.org/trac/boost/changeset/42231

Log:
Some minor changes for Visual C++.
Text files modified: 
   branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp      |     3 ++-                                     
   branches/unordered/dev/libs/unordered/test/unordered/compile_tests.cpp |     2 +-                                      
   2 files changed, 3 insertions(+), 2 deletions(-)

Modified: branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp
==============================================================================
--- branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp	(original)
+++ branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp	2007-12-21 07:04:52 EST (Fri, 21 Dec 2007)
@@ -1892,7 +1892,8 @@
             inline std::size_t group_hash(link_ptr it, type_wrapper<key_type>*) const
             {
                 std::size_t seed = data::group_count(it);
-                boost::hash_combine(seed, hash_function()(data::get_value(it)));
+                std::size_t hashed_key = hash_function()(data::get_value(it)); 
+                boost::hash_combine(seed, hashed_key);
                 return seed;
             }
 

Modified: branches/unordered/dev/libs/unordered/test/unordered/compile_tests.cpp
==============================================================================
--- branches/unordered/dev/libs/unordered/test/unordered/compile_tests.cpp	(original)
+++ branches/unordered/dev/libs/unordered/test/unordered/compile_tests.cpp	2007-12-21 07:04:52 EST (Fri, 21 Dec 2007)
@@ -59,7 +59,7 @@
 }
 
 template <class X, class Key, class T>
-void unordered_map_functions(X&, Key const& k, T const& t)
+void unordered_map_functions(X&, Key const& k, T const&)
 {
     typedef typename X::mapped_type mapped_type;