From ffd0154fb66a83c838523f430d040c587b043d0a Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 15 May 2007 22:05:41 +0000
Subject: [PATCH] Rolling back changes I shouldn't have checked in.

[SVN r37699]
---
 hash/doc/hash.qbk                      |  4 ++--
 hash/doc/tutorial.qbk                  |  4 ++--
 include/boost/functional/hash/hash.hpp | 16 +++-------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/hash/doc/hash.qbk b/hash/doc/hash.qbk
index d858f71..3bab67a 100644
--- a/hash/doc/hash.qbk
+++ b/hash/doc/hash.qbk
@@ -1,7 +1,7 @@
 [library Boost.Functional/Hash
     [quickbook 1.3]
     [authors [James, Daniel]]
-    [copyright 2005 2007 Daniel James]
+    [copyright 2005 2006 Daniel James]
     [purpose A TR1 hash function object that can be extended to hash user
         defined types]
     [category higher-order]
@@ -10,7 +10,7 @@
     [license
         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])
+        [@http://www.boost.org/LICENSE_1_0.txt]
     ]
 ]
 
diff --git a/hash/doc/tutorial.qbk b/hash/doc/tutorial.qbk
index e30a181..cf17c7a 100644
--- a/hash/doc/tutorial.qbk
+++ b/hash/doc/tutorial.qbk
@@ -1,5 +1,5 @@
 
-[/ Copyright 2005-2007 Daniel James.
+[/ Copyright 2005-2006 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) ]
 
@@ -119,7 +119,7 @@ When writing a hash function, first look at how the equality function works.
 Objects that are equal must generate the same hash value.
 When objects are not equal they should generate different hash values.
 In this object equality was based just on the id so the hash function
-only hashes the id. If it was based on the object's name and author
+only hash the id. If it was based on the objects name and author
 then the hash function should take them into account
 (how to do this is discussed in the next section).
 ]
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index f7d0f2b..251f96d 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,5 +1,5 @@
 
-//  Copyright Daniel James 2005-2007. Use, modification, and distribution are
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
 //  subject to 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)
 
@@ -28,11 +28,6 @@
 #include <boost/type_traits/is_const.hpp>
 #endif
 
-#if defined(BOOST_MSVC)
-#   pragma warning(push)
-#   pragma warning(disable:4267)
-#endif
-
 namespace boost
 {
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
@@ -46,13 +41,12 @@ namespace boost
     std::size_t hash_value(long);
     std::size_t hash_value(unsigned long);
 
-#if defined(_M_X64) && defined(_WIN64)
+#if defined(BOOST_MSVC) && defined(_WIN64)
     // On 64-bit windows std::size_t is a typedef for unsigned long long, which
     // isn't due to be supported until Boost 1.35. So add support here.
     // (Technically, Boost.Hash isn't actually documented as supporting
     // std::size_t. But it would be pretty silly not to).
-    std::size_t hash_value(long long);
-    std::size_t hash_value(unsigned long long);
+    std::size_t hash_value(std::size_t);
 #endif
 
 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
@@ -594,9 +588,5 @@ namespace boost
 #endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 }
 
-#if defined(BOOST_MSVC)
-#   pragma warning(pop)
-#endif
-
 #endif