boostorg/functional
1
0
Fork 1
mirror of https://github.com/boostorg/functional.git synced 2025-08-02 14:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rolling back changes I shouldn't have checked in.

Browse Source 
[SVN r37699]
This commit is contained in:
Daniel James
2007-05-15 22:05:41 +00:00
parent 5af8d5f1b3
commit ffd0154fb6
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hash/doc/hash.qbk
View File

@@ -1,7 +1,7 @@
[library Boost.Functional/Hash [library Boost.Functional/Hash
[quickbook 1.3] [quickbook 1.3]
[authors [James, Daniel]] [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 [purpose A TR1 hash function object that can be extended to hash user
defined types] defined types]
[category higher-order] [category higher-order]
@@ -10,7 +10,7 @@
[license [license
Distributed under the Boost Software License, Version 1.0. Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at (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]
] ]
] ]

4
hash/doc/tutorial.qbk
View File

@@ -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 / 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) ] / 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. Objects that are equal must generate the same hash value.
When objects are not equal they should generate different hash values. 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 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 then the hash function should take them into account
(how to do this is discussed in the next section). (how to do this is discussed in the next section).
] ]

16
include/boost/functional/hash/hash.hpp
View File

@@ -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 // 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) // 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> #include <boost/type_traits/is_const.hpp>
#endif #endif
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4267)
#endif
namespace boost namespace boost
{ {
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) #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(long);
std::size_t hash_value(unsigned 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 // 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. // isn't due to be supported until Boost 1.35. So add support here.
// (Technically, Boost.Hash isn't actually documented as supporting // (Technically, Boost.Hash isn't actually documented as supporting
// std::size_t. But it would be pretty silly not to). // std::size_t. But it would be pretty silly not to).
std::size_t hash_value(long long); std::size_t hash_value(std::size_t);
std::size_t hash_value(unsigned long long);
#endif #endif
#if !BOOST_WORKAROUND(__DMC__, <= 0x848) #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
@@ -594,9 +588,5 @@ namespace boost
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
} }
#if defined(BOOST_MSVC)
# pragma warning(pop)
#endif
#endif #endif