Make the unordered constructors from allocators explicit.

And clean of the FNV-1 example & documentation a little. Merged revisions 47085,47132,47143-47146 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r47085 | danieljames | 2008-07-04 23:57:20 +0100 (Fri, 04 Jul 2008) | 4 lines Require explicit conversion from allocators. (Not what it says in the draft standard, but I think that might be a defect). ........ r47132 | danieljames | 2008-07-06 13:41:09 +0100 (Sun, 06 Jul 2008) | 2 lines 'Bias' should be 'basis'. ........ r47143 | danieljames | 2008-07-06 22:06:52 +0100 (Sun, 06 Jul 2008) | 1 line Clean up the FNV-1 comments. ........ r47144 | danieljames | 2008-07-06 22:07:31 +0100 (Sun, 06 Jul 2008) | 1 line I've only got one hash function for release, so no need for its own directory. ........ r47145 | danieljames | 2008-07-06 22:08:11 +0100 (Sun, 06 Jul 2008) | 1 line Remove the hash_functions directory (for now). ........ r47146 | danieljames | 2008-07-06 22:29:47 +0100 (Sun, 06 Jul 2008) | 1 line Update the docs for the new location of FNV-1. ........ [SVN r47150]
2008-07-06 22:00:18 +00:00
parent 56b9e0da1a
commit 4e4f99d51f
7 changed files with 78 additions and 86 deletions
--- a/examples/fnv1.hpp
+++ b/examples/fnv1.hpp
@@ -0,0 +1,66 @@
+
+// Copyright 2008 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)
+
+// This code is also released into the public domain.
+
+// Algorithm from: http://www.isthe.com/chongo/tech/comp/fnv/
+
+#include <string>
+
+namespace hash
+{
+    template <std::size_t FnvPrime, std::size_t OffsetBasis>
+    struct basic_fnv_1
+    {
+        std::size_t operator()(std::string const& text) const
+        {
+            std::size_t hash = OffsetBasis;
+            for(std::string::const_iterator it = text.begin(), end = text.end();
+                    it != end; ++it)
+            {
+                hash *= FnvPrime;
+                hash ^= *it;
+            }
+
+            return hash;
+        }
+    };
+
+    template <std::size_t FnvPrime, std::size_t OffsetBasis>
+    struct basic_fnv_1a
+    {
+        std::size_t operator()(std::string const& text) const
+        {
+            std::size_t hash = OffsetBasis;
+            for(std::string::const_iterator it = text.begin(), end = text.end();
+                    it != end; ++it)
+            {
+                hash ^= *it;
+                hash *= FnvPrime;
+            }
+
+            return hash;
+        }
+    };
+
+    // For 32 bit machines:
+    const std::size_t fnv_prime = 16777619u;
+    const std::size_t fnv_offset_basis = 2166136261u;
+
+    // For 64 bit machines:
+    // const std::size_t fnv_prime = 1099511628211u;
+    // const std::size_t fnv_offset_basis = 14695981039346656037u;
+
+    // For 128 bit machines:
+    // const std::size_t fnv_prime = 309485009821345068724781401u;
+    // const std::size_t fnv_offset_basis = 275519064689413815358837431229664493455u;
+
+    // For 256 bit machines:
+    // const std::size_t fnv_prime = 374144419156711147060143317175368453031918731002211u;
+    // const std::size_t fnv_offset_basis = 100029257958052580907070968620625704837092796014241193945225284501741471925557u;
+
+    typedef basic_fnv_1<fnv_prime, fnv_offset_basis> fnv_1;
+    typedef basic_fnv_1a<fnv_prime, fnv_offset_basis> fnv_1a;
+}