summaryrefslogtreecommitdiff
path: root/absl/hash/hash.h
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2018-10-12 06:53:34 -0700
committerGravatar CJ Johnson <johnsoncj@google.com>2018-10-12 10:26:45 -0400
commita00bdd176d66ef0b417d9576052a19091fbdf891 (patch)
tree9066ed8bdf727ef9f95db60ec44a7132224cf64b /absl/hash/hash.h
parentf340f773edab951656b19b6f1a77c964a78ec4c2 (diff)
Export of internal Abseil changes.
-- fa894a667a3bebbe479539c8d5e829beebf36c27 by Abseil Team <absl-team@google.com>: Import of CCTZ from GitHub. PiperOrigin-RevId: 216855907 -- 59e0a42fa9045eb164573b82ce625248bd9999f3 by Jon Cohen <cohenjon@google.com>: Some edits to the documentation for absl::Hash as I was reading through it. Itemized changes: * implement -> implements for grammar * Fix an incomplete sentence * specify *any* type T as opposed to *a* type T ? this is just the language I tend to see for these sorts of concepts in math and makes it more clear that we?re talking about a set of all types T satisfying these constraints * add arguments to comine() and combine_contiguous() ? this was mostly because for hash_continuous there was a reference to `size` elements without any mention of what `size` was. PiperOrigin-RevId: 216766923 -- c2a744d0f70ec5a079c22502b7a7ca72805a29dc by Shaindel Schwartz <shaindel@google.com>: Remove unneeded include. PiperOrigin-RevId: 216703710 -- ad22fc4e3d236f7bd354b61e0fa37ea524a7cf5e by Shaindel Schwartz <shaindel@google.com>: Fix typos. PiperOrigin-RevId: 216699071 GitOrigin-RevId: fa894a667a3bebbe479539c8d5e829beebf36c27 Change-Id: I35c8d8be66043aad9f17bbb867e69acb770bd1b0
Diffstat (limited to 'absl/hash/hash.h')
-rw-r--r--absl/hash/hash.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/absl/hash/hash.h b/absl/hash/hash.h
index c7ba4c2b..8cbb19e2 100644
--- a/absl/hash/hash.h
+++ b/absl/hash/hash.h
@@ -25,8 +25,8 @@
// * `AbslHashValue`, an extension point that allows you to extend types to
// support Abseil hashing without requiring you to define a hashing
// algorithm.
-// * `HashState`, a type-erased class which implement the manipulation of the
-// hash state (H) itself. containing member functions `combine()` and
+// * `HashState`, a type-erased class which implements the manipulation of the
+// hash state (H) itself, contains member functions `combine()` and
// `combine_contiguous()`, which you can use to contribute to an existing
// hash state when hashing your types.
//
@@ -69,7 +69,7 @@ namespace absl {
// `absl::Hash`
// -----------------------------------------------------------------------------
//
-// `absl::Hash<T>` is a convenient general-purpose hash functor for a type `T`
+// `absl::Hash<T>` is a convenient general-purpose hash functor for any type `T`
// satisfying any of the following conditions (in order):
//
// * T is an arithmetic or pointer type
@@ -142,7 +142,7 @@ namespace absl {
//
// The "hash state" concept contains two member functions for mixing hash state:
//
-// * `H::combine()`
+// * `H::combine(state, values...)`
//
// Combines an arbitrary number of values into a hash state, returning the
// updated state. Note that the existing hash state is move-only and must be
@@ -160,7 +160,7 @@ namespace absl {
// state = H::combine(std::move(state), value2);
// state = H::combine(std::move(state), value3);
//
-// * `H::combine_contiguous()`
+// * `H::combine_contiguous(state, data, size)`
//
// Combines a contiguous array of `size` elements into a hash state,
// returning the updated state. Note that the existing hash state is