Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1937)

Unified Diff: base/hash.h

Issue 1538743002: Switch to standard integer types in base/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DEPS roll too Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/guid_win.cc ('k') | base/hash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/hash.h
diff --git a/base/hash.h b/base/hash.h
index e46f6ac24842d3ddb2d8263ae2a2f8f3c8164834..ed8d9fd4cc9b987272f9d54ffa854c2d86f7129e 100644
--- a/base/hash.h
+++ b/base/hash.h
@@ -5,21 +5,23 @@
#ifndef BASE_HASH_H_
#define BASE_HASH_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <limits>
#include <string>
#include "base/base_export.h"
-#include "base/basictypes.h"
#include "base/logging.h"
namespace base {
// WARNING: This hash function should not be used for any cryptographic purpose.
-BASE_EXPORT uint32 SuperFastHash(const char* data, int len);
+BASE_EXPORT uint32_t SuperFastHash(const char* data, int len);
// Computes a hash of a memory buffer |data| of a given |length|.
// WARNING: This hash function should not be used for any cryptographic purpose.
-inline uint32 Hash(const char* data, size_t length) {
+inline uint32_t Hash(const char* data, size_t length) {
if (length > static_cast<size_t>(std::numeric_limits<int>::max())) {
NOTREACHED();
return 0;
@@ -29,7 +31,7 @@ inline uint32 Hash(const char* data, size_t length) {
// Computes a hash of a string |str|.
// WARNING: This hash function should not be used for any cryptographic purpose.
-inline uint32 Hash(const std::string& str) {
+inline uint32_t Hash(const std::string& str) {
return Hash(str.data(), str.size());
}
« no previous file with comments | « base/guid_win.cc ('k') | base/hash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698