diff options
| author | avi <avi@chromium.org> | 2015-12-25 19:07:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 03:08:28 +0000 |
| commit | 204e0c93c1e9899b49d7a07b8204edc95479fdff (patch) | |
| tree | 9183ed6c8399b412b7af62f5bec1241c912117cd /third_party/cacheinvalidation/overrides | |
| parent | c80b1b61bf666dfc15b6f93e8c6701cb30dc9354 (diff) | |
| download | chromium_src-204e0c93c1e9899b49d7a07b8204edc95479fdff.zip chromium_src-204e0c93c1e9899b49d7a07b8204edc95479fdff.tar.gz chromium_src-204e0c93c1e9899b49d7a07b8204edc95479fdff.tar.bz2 | |
Switch to standard integer types in third_party/cacheinvalidation/.
BUG=138542
Review URL: https://codereview.chromium.org/1550613002
Cr-Commit-Position: refs/heads/master@{#366887}
Diffstat (limited to 'third_party/cacheinvalidation/overrides')
| -rw-r--r-- | third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/mutex.h | 2 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/mutex.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/mutex.h index 1f0e23c..a42785c 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/mutex.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/mutex.h @@ -5,6 +5,7 @@ #ifndef GOOGLE_CACHEINVALIDATION_DEPS_MUTEX_H_ #define GOOGLE_CACHEINVALIDATION_DEPS_MUTEX_H_ +#include "base/macros.h" #include "base/logging.h" #include "base/synchronization/lock.h" @@ -18,6 +19,7 @@ class MutexLock { private: base::AutoLock auto_lock_; + DISALLOW_COPY_AND_ASSIGN(MutexLock); }; diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h index c8f75a4..80e37e5 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/string_util.h @@ -5,6 +5,8 @@ #ifndef GOOGLE_CACHEINVALIDATION_DEPS_STRING_UTIL_H_ #define GOOGLE_CACHEINVALIDATION_DEPS_STRING_UTIL_H_ +#include <stdint.h> + #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" @@ -17,7 +19,7 @@ inline std::string SimpleItoa(int v) { return base::IntToString(v); } -inline std::string SimpleItoa(int64 v) { +inline std::string SimpleItoa(int64_t v) { return base::Int64ToString(v); } |