Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

Process #ifndef...#else...#endif blocks.

[SVN r86245]

doc/changes.qbk

@@ -168,15 +168,5 @@
   ([ticket 8822]).
 * Suppress Visual C++ infinite loop warning ([ticket 8568]).
 
-[h2 Boost 1.56.0]
-
-* Removed some Visual C++ 6 workarounds.
-* Ongoing work on improving `hash_combine`. This changes the combine function
-  which was previously defined in the reference documentation.
-
-[h2 Boost 1.58.0]
-
-* Fixed strict aliasing violation
-  ([@https://github.com/boostorg/functional/pull/3 GitHub #3]).
 
 [endsect]

doc/ref.xml

@@ -59,11 +59,6 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
               Forward declared in
               <code>&lt;boost/functional/hash_fwd.hpp&gt;</code>
             </para>
-            <para>
-              This hash function is not intended for general use, and isn't
-              guaranteed to be equal during separate runs of a program - so
-              please don't use it for any persistent storage or communication.
-            </para>
           </notes>
           <throws><para>
             Only throws if
@@ -455,15 +450,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
             Called repeatedly to incrementally create a hash value from
             several variables.
         </simpara></purpose>
-        <effects>
-            Updates <code>seed</code> with a new hash value generated by
-            combining it with the result of
-            <code><functionname>hash_value</functionname>(v)</code>. Will
-            always produce the same result for the same combination of
-            <code>seed</code> and
-            <code><functionname>hash_value</functionname>(v)</code> during
-            the single run of a program.
-        </effects>
+        <effects><programlisting>seed ^= <functionname>hash_value</functionname>(v) + 0x9e3779b9 + (seed &lt;&lt; 6) + (seed &gt;&gt; 2);</programlisting></effects>
         <notes>
           <para><functionname>hash_value</functionname> is called without
           qualification, so that overloads can be found via ADL.</para>
@@ -472,11 +459,6 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
             Forward declared in
             <code>&lt;boost/functional/hash_fwd.hpp&gt;</code>
           </para>
-          <para>
-            This hash function is not intended for general use, and isn't
-            guaranteed to be equal during separate runs of a program - so
-            please don't use it for any persistent storage or communication.
-          </para>
         </notes>
         <throws>
           Only throws if <functionname>hash_value</functionname>(T) throws.
@@ -545,11 +527,6 @@ for(; first != last; ++first)
             Forward declared in
             <code>&lt;boost/functional/hash_fwd.hpp&gt;</code>
           </para>
-          <para>
-            This hash function is not intended for general use, and isn't
-            guaranteed to be equal during separate runs of a program - so
-            please don't use it for any persistent storage or communication.
-          </para>
         </notes>
         <throws><para>
           Only throws if <code><functionname>hash_value</functionname>(std::iterator_traits&lt;It&gt;::value_type)</code>
@@ -807,11 +784,6 @@ for(; first != last; ++first)
 
         <notes>
           <para>This is an extension to TR1</para>
-          <para>
-            This hash function is not intended for general use, and isn't
-            guaranteed to be equal during separate runs of a program - so
-            please don't use it for any persistent storage or communication.
-          </para>
         </notes>
 
         <throws>

include/boost/functional/hash/detail/hash_float.hpp

@@ -68,7 +68,7 @@ namespace boost
             std::size_t seed = 0;
 
             if (length >= sizeof(std::size_t)) {
-                std::memcpy(&seed, ptr, sizeof(std::size_t));
+                seed = *(std::size_t*) ptr;
                 length -= sizeof(std::size_t);
                 ptr += sizeof(std::size_t);
 

include/boost/functional/hash/extensions.hpp

@@ -251,7 +251,6 @@ namespace boost
     //
 
 
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 
     template <class T> struct hash
         : std::unary_function<T, std::size_t>
@@ -280,39 +279,6 @@ namespace boost
     };
 #endif
 
-#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-    // On compilers without partial specialization, boost::hash<T>
-    // has already been declared to deal with pointers, so just
-    // need to supply the non-pointer version of hash_impl.
-
-    namespace hash_detail
-    {
-        template <bool IsPointer>
-        struct hash_impl;
-
-        template <>
-        struct hash_impl<false>
-        {
-            template <class T>
-            struct inner
-                : std::unary_function<T, std::size_t>
-            {
-#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-                std::size_t operator()(T const& val) const
-                {
-                    return hash_value(val);
-                }
-#else
-                std::size_t operator()(T const& val) const
-                {
-                    return hash_detail::call_hash<T>::call(val);
-                }
-#endif
-            };
-        };
-    }
-#endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 }
 
 #endif

include/boost/functional/hash/hash.hpp

@@ -1,17 +1,11 @@
 
-// Copyright 2005-2014 Daniel James.
+// Copyright 2005-2009 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)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
 //  issue 6.18. 
-//
-//  This also contains public domain code from MurmurHash. From the
-//  MurmurHash header:
-
-// MurmurHash3 was written by Austin Appleby, and is placed in the public
-// domain. The author hereby disclaims copyright to this source code.
 
 #if !defined(BOOST_FUNCTIONAL_HASH_HASH_HPP)
 #define BOOST_FUNCTIONAL_HASH_HASH_HPP
@@ -24,11 +18,7 @@
 #include <boost/type_traits/is_enum.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <boost/cstdint.hpp>
 
-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-#include <boost/type_traits/is_pointer.hpp>
-#endif
 
 #if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
 #include <typeindex>
@@ -45,19 +35,6 @@
 
 #endif
 
-#if BOOST_WORKAROUND(__GNUC__, < 3) \
-    && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
-#define BOOST_HASH_CHAR_TRAITS string_char_traits
-#else
-#define BOOST_HASH_CHAR_TRAITS char_traits
-#endif
-
-#if defined(_MSC_VER)
-#   define BOOST_FUNCTIONAL_HASH_ROTL32(x, r) _rotl(x,r)
-#else
-#   define BOOST_FUNCTIONAL_HASH_ROTL32(x, r) (x << r) | (x >> (32 - r))
-#endif
-
 namespace boost
 {
     namespace hash_detail
@@ -152,7 +129,7 @@ namespace boost
 
     template <class Ch, class A>
     std::size_t hash_value(
-        std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const&);
+        std::basic_string<Ch, std::char_traits<Ch>, A> const&);
 
     template <typename T>
     typename boost::hash_detail::float_numbers<T>::type hash_value(T);
@@ -205,51 +182,6 @@ namespace boost
 
              return seed;
         }
-
-        template <typename SizeT>
-        inline void hash_combine_impl(SizeT& seed, SizeT value)
-        {
-            seed ^= value + 0x9e3779b9 + (seed<<6) + (seed>>2);
-        }
-
-        template <typename SizeT>
-        inline void hash_combine_impl(boost::uint32_t& h1,
-                boost::uint32_t k1)
-        {
-            const uint32_t c1 = 0xcc9e2d51;
-            const uint32_t c2 = 0x1b873593;
-
-            k1 *= c1;
-            k1 = BOOST_FUNCTIONAL_HASH_ROTL32(k1,15);
-            k1 *= c2;
-
-            h1 ^= k1;
-            h1 = BOOST_FUNCTIONAL_HASH_ROTL32(h1,13);
-            h1 = h1*5+0xe6546b64;
-        }
-
-
-// Don't define 64-bit hash combine on platforms with 64 bit integers,
-// and also not for 32-bit gcc as it warns about the 64-bit constant.
-#if !defined(BOOST_NO_INT64_T) && \
-        !(defined(__GNUC__) && ULONG_MAX == 0xffffffff)
-
-        template <typename SizeT>
-        inline void hash_combine_impl(boost::uint64_t& h,
-                boost::uint64_t k)
-        {
-            const uint64_t m = UINT64_C(0xc6a4a7935bd1e995);
-            const int r = 47;
-
-            k *= m;
-            k ^= k >> r;
-            k *= m;
-
-            h ^= k;
-            h *= m;
-        }
-
-#endif // BOOST_NO_INT64_T
     }
 
     template <typename T>
@@ -310,7 +242,7 @@ namespace boost
     inline void hash_combine(std::size_t& seed, T const& v)
     {
         boost::hash<T> hasher;
-        return boost::hash_detail::hash_combine_impl(seed, hasher(v));
+        seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
     }
 
 #if defined(BOOST_MSVC)
@@ -381,7 +313,7 @@ namespace boost
 
     template <class Ch, class A>
     inline std::size_t hash_value(
-        std::basic_string<Ch, std::BOOST_HASH_CHAR_TRAITS<Ch>, A> const& v)
+        std::basic_string<Ch, std::char_traits<Ch>, A> const& v)
     {
         return hash_range(v.begin(), v.end());
     }
@@ -477,7 +409,6 @@ namespace boost
 
 // Specializing boost::hash for pointers.
 
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 
     template <class T>
     struct hash<T*>
@@ -496,53 +427,8 @@ namespace boost
         }
     };
 
-#else
-
-    // For compilers without partial specialization, we define a
-    // boost::hash for all remaining types. But hash_impl is only defined
-    // for pointers in 'extensions.hpp' - so when BOOST_HASH_NO_EXTENSIONS
-    // is defined there will still be a compile error for types not supported
-    // in the standard.
-
-    namespace hash_detail
-    {
-        template <bool IsPointer>
-        struct hash_impl;
-
-        template <>
-        struct hash_impl<true>
-        {
-            template <class T>
-            struct inner
-                : public std::unary_function<T, std::size_t>
-            {
-                std::size_t operator()(T val) const
-                {
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 590)
-                    return boost::hash_value(val);
-#else
-                    std::size_t x = static_cast<std::size_t>(
-                        reinterpret_cast<std::ptrdiff_t>(val));
-
-                    return x + (x >> 3);
-#endif
-                }
-            };
-        };
-    }
-
-    template <class T> struct hash
-        : public boost::hash_detail::hash_impl<boost::is_pointer<T>::value>
-            ::BOOST_NESTED_TEMPLATE inner<T>
-    {
-    };
-
-#endif
 }
 
-#undef BOOST_HASH_CHAR_TRAITS
-#undef BOOST_FUNCTIONAL_HASH_ROTL32
-
 #if defined(BOOST_MSVC)
 #pragma warning(pop)
 #endif

meta/libraries.json

@@ -1,20 +0,0 @@
-[
-    {
-        "key": "functional/hash",
-        "boost-version": "1.33.0",
-        "name": "Functional/Hash",
-        "authors": [
-            "Daniel James"
-        ],
-        "maintainers": [
-            "Daniel James <dnljms -at- gmail.com>"
-        ],
-        "description": "A TR1 hash function object that can be extended to hash user defined types.",
-        "std": [
-            "tr1"
-        ],
-        "category": [
-            "Function-objects"
-        ]
-    }
-]