diff options
| author | avi <avi@chromium.org> | 2015-12-27 13:23:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-27 21:24:04 +0000 |
| commit | 1ff754ced685b74915215ae58546862b13b10ce2 (patch) | |
| tree | 57bc0350194d32fe326fb962ad1c666f5dbd2e67 | |
| parent | 7ef9ccf2c19b88e63be5da1bc7c79cc3e419272e (diff) | |
| download | chromium_src-1ff754ced685b74915215ae58546862b13b10ce2.zip chromium_src-1ff754ced685b74915215ae58546862b13b10ce2.tar.gz chromium_src-1ff754ced685b74915215ae58546862b13b10ce2.tar.bz2 | |
Switch to standard integer types in third_party/leveldatabase/.
BUG=138542
TBR=cmumford@chromium.org
Review URL: https://codereview.chromium.org/1546193003
Cr-Commit-Position: refs/heads/master@{#366933}
| -rw-r--r-- | third_party/leveldatabase/DEPS | 1 | ||||
| -rw-r--r-- | third_party/leveldatabase/chromium_logger.h | 4 | ||||
| -rw-r--r-- | third_party/leveldatabase/port/port_chromium.h | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/third_party/leveldatabase/DEPS b/third_party/leveldatabase/DEPS index da4af4a..398a684 100644 --- a/third_party/leveldatabase/DEPS +++ b/third_party/leveldatabase/DEPS @@ -1,5 +1,6 @@ include_rules = [ '+base', + '+build', '+testing', # internal includes diff --git a/third_party/leveldatabase/chromium_logger.h b/third_party/leveldatabase/chromium_logger.h index 933fb51..27ab3ab 100644 --- a/third_party/leveldatabase/chromium_logger.h +++ b/third_party/leveldatabase/chromium_logger.h @@ -5,6 +5,8 @@ #ifndef THIRD_PARTY_LEVELDATABASE_CHROMIUM_LOGGER_H_ #define THIRD_PARTY_LEVELDATABASE_CHROMIUM_LOGGER_H_ +#include <stdint.h> + #include "base/files/file.h" #include "base/format_macros.h" #include "base/strings/string_util.h" @@ -48,7 +50,7 @@ class ChromiumLogger : public Logger { t.minute, t.second, t.millisecond, - static_cast<uint64>(thread_id)); + static_cast<uint64_t>(thread_id)); // Print the message if (p < limit) { diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h index 3548d62..5e542ba 100644 --- a/third_party/leveldatabase/port/port_chromium.h +++ b/third_party/leveldatabase/port/port_chromium.h @@ -7,13 +7,17 @@ #ifndef STORAGE_LEVELDB_PORT_PORT_CHROMIUM_H_ #define STORAGE_LEVELDB_PORT_PORT_CHROMIUM_H_ +#include <stddef.h> #include <stdint.h> -#include <string> + #include <cstring> +#include <string> + #include "base/atomicops.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" +#include "build/build_config.h" // Linux's ThreadIdentifier() needs this. #if defined(OS_LINUX) |