From 0b519209e65b5de7a00e52464464ad211bba27af Mon Sep 17 00:00:00 2001 From: avi Date: Sun, 20 Dec 2015 23:25:19 -0800 Subject: Switch to standard integer types in xxx/. BUG=138542 TBR=shess@chromium.org Review URL: https://codereview.chromium.org/1533283002 Cr-Commit-Position: refs/heads/master@{#366346} --- sql/connection.cc | 14 ++++++++------ sql/connection.h | 1 + sql/connection_unittest.cc | 8 ++++++-- sql/meta_table.cc | 2 ++ sql/meta_table_unittest.cc | 2 ++ sql/mojo/mojo_vfs.cc | 3 +++ sql/mojo/sql_test_base.cc | 3 +++ sql/mojo/sql_test_base.h | 1 + sql/mojo/vfs_unittest.cc | 3 +++ sql/recovery.cc | 2 ++ sql/recovery.h | 2 ++ sql/recovery_unittest.cc | 2 ++ sql/sql_memory_dump_provider.h | 1 + sql/sqlite_features_unittest.cc | 7 +++++-- sql/statement.cc | 3 +++ sql/test/error_callback_support.h | 1 + sql/test/sql_test_base.h | 1 + sql/test/test_helpers.cc | 3 +++ sql/test/test_helpers.h | 3 +++ 19 files changed, 52 insertions(+), 10 deletions(-) (limited to 'sql') diff --git a/sql/connection.cc b/sql/connection.cc index 1213a77f..88acef0 100644 --- a/sql/connection.cc +++ b/sql/connection.cc @@ -4,6 +4,8 @@ #include "sql/connection.h" +#include +#include #include #include "base/bind.h" @@ -120,22 +122,22 @@ bool ValidAttachmentPoint(const char* attachment_point) { } void RecordSqliteMemory10Min() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.TenMinutes", used / 1024); } void RecordSqliteMemoryHour() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneHour", used / 1024); } void RecordSqliteMemoryDay() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneDay", used / 1024); } void RecordSqliteMemoryWeek() { - const int64 used = sqlite3_memory_used(); + const int64_t used = sqlite3_memory_used(); UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneWeek", used / 1024); } @@ -843,7 +845,7 @@ std::string Connection::CollectCorruptionInfo() { // If the file cannot be accessed it is unlikely that an integrity check will // turn up actionable information. const base::FilePath db_path = DbPath(); - int64 db_size = -1; + int64_t db_size = -1; if (!base::GetFileSize(db_path, &db_size) || db_size < 0) return std::string(); @@ -855,7 +857,7 @@ std::string Connection::CollectCorruptionInfo() { db_size); // Only check files up to 8M to keep things from blocking too long. - const int64 kMaxIntegrityCheckSize = 8192 * 1024; + const int64_t kMaxIntegrityCheckSize = 8192 * 1024; if (db_size > kMaxIntegrityCheckSize) { debug_info += "integrity_check skipped due to size\n"; } else { diff --git a/sql/connection.h b/sql/connection.h index 7a80077..e121b9f 100644 --- a/sql/connection.h +++ b/sql/connection.h @@ -5,6 +5,7 @@ #ifndef SQL_CONNECTION_H_ #define SQL_CONNECTION_H_ +#include #include #include #include diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc index 219da7f..d25f7c9 100644 --- a/sql/connection_unittest.cc +++ b/sql/connection_unittest.cc @@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#include + #include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/statistics_recorder.h" #include "base/test/histogram_tester.h" #include "base/trace_event/process_memory_dump.h" @@ -211,14 +215,14 @@ class ScopedUmaskSetter { void sqlite_adjust_millis(sql::test::ScopedMockTimeSource* time_mock, sqlite3_context* context, int argc, sqlite3_value** argv) { - int64 milliseconds = argc > 0 ? sqlite3_value_int64(argv[0]) : 1000; + int64_t milliseconds = argc > 0 ? sqlite3_value_int64(argv[0]) : 1000; time_mock->adjust(base::TimeDelta::FromMilliseconds(milliseconds)); sqlite3_result_int64(context, milliseconds); } // Adjust mock time by |milliseconds| on commit. int adjust_commit_hook(sql::test::ScopedMockTimeSource* time_mock, - int64 milliseconds) { + int64_t milliseconds) { time_mock->adjust(base::TimeDelta::FromMilliseconds(milliseconds)); return SQLITE_OK; } diff --git a/sql/meta_table.cc b/sql/meta_table.cc index 011fe18..b3e0503 100644 --- a/sql/meta_table.cc +++ b/sql/meta_table.cc @@ -4,6 +4,8 @@ #include "sql/meta_table.h" +#include + #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h" diff --git a/sql/meta_table_unittest.cc b/sql/meta_table_unittest.cc index 13d0b5d..d46795f 100644 --- a/sql/meta_table_unittest.cc +++ b/sql/meta_table_unittest.cc @@ -4,6 +4,8 @@ #include "sql/meta_table.h" +#include + #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "sql/connection.h" diff --git a/sql/mojo/mojo_vfs.cc b/sql/mojo/mojo_vfs.cc index 943f38b..0fc2b48 100644 --- a/sql/mojo/mojo_vfs.cc +++ b/sql/mojo/mojo_vfs.cc @@ -4,6 +4,9 @@ #include "sql/mojo/mojo_vfs.h" +#include +#include + #include "base/logging.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" diff --git a/sql/mojo/sql_test_base.cc b/sql/mojo/sql_test_base.cc index 3018728..caa903a 100644 --- a/sql/mojo/sql_test_base.cc +++ b/sql/mojo/sql_test_base.cc @@ -4,6 +4,9 @@ #include "sql/mojo/sql_test_base.h" +#include +#include + #include "mojo/application/public/cpp/application_impl.h" #include "mojo/util/capture_util.h" #include "sql/mojo/mojo_vfs.h" diff --git a/sql/mojo/sql_test_base.h b/sql/mojo/sql_test_base.h index d39198d..6494752 100644 --- a/sql/mojo/sql_test_base.h +++ b/sql/mojo/sql_test_base.h @@ -6,6 +6,7 @@ #define SQL_MOJO_SQL_TEST_BASE_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "mojo/application/public/cpp/application_test_base.h" diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc index 38de192..d6eee65 100644 --- a/sql/mojo/vfs_unittest.cc +++ b/sql/mojo/vfs_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include +#include "base/macros.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_test_base.h" diff --git a/sql/recovery.cc b/sql/recovery.cc index 6691d07..7014433 100644 --- a/sql/recovery.cc +++ b/sql/recovery.cc @@ -4,6 +4,8 @@ #include "sql/recovery.h" +#include + #include "base/files/file_path.h" #include "base/format_macros.h" #include "base/logging.h" diff --git a/sql/recovery.h b/sql/recovery.h index e334d34..c03ebb2 100644 --- a/sql/recovery.h +++ b/sql/recovery.h @@ -5,6 +5,8 @@ #ifndef SQL_RECOVERY_H_ #define SQL_RECOVERY_H_ +#include + #include "base/macros.h" #include "sql/connection.h" diff --git a/sql/recovery_unittest.cc b/sql/recovery_unittest.cc index bbddd97..36c9de7 100644 --- a/sql/recovery_unittest.cc +++ b/sql/recovery_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include #include "base/bind.h" diff --git a/sql/sql_memory_dump_provider.h b/sql/sql_memory_dump_provider.h index 051755f..01d7f04 100644 --- a/sql/sql_memory_dump_provider.h +++ b/sql/sql_memory_dump_provider.h @@ -5,6 +5,7 @@ #ifndef SQL_PROCESS_MEMORY_DUMP_PROVIDER_H #define SQL_PROCESS_MEMORY_DUMP_PROVIDER_H +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/trace_event/memory_dump_provider.h" #include "sql/sql_export.h" diff --git a/sql/sqlite_features_unittest.cc b/sql/sqlite_features_unittest.cc index db60072..9b8c971 100644 --- a/sql/sqlite_features_unittest.cc +++ b/sql/sqlite_features_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#include + #include #include "base/bind.h" @@ -191,8 +194,8 @@ TEST_F(SQLiteFeaturesTest, Mmap) { } db().Close(); - const uint32 kFlags = - base::File::FLAG_OPEN|base::File::FLAG_READ|base::File::FLAG_WRITE; + const uint32_t kFlags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; char buf[4096]; // Create a file with a block of '0', a block of '1', and a block of '2'. diff --git a/sql/statement.cc b/sql/statement.cc index 2a0faa7..1502b09 100644 --- a/sql/statement.cc +++ b/sql/statement.cc @@ -4,6 +4,9 @@ #include "sql/statement.h" +#include +#include + #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/sql/test/error_callback_support.h b/sql/test/error_callback_support.h index 3026857..21caef3 100644 --- a/sql/test/error_callback_support.h +++ b/sql/test/error_callback_support.h @@ -5,6 +5,7 @@ #ifndef SQL_TEST_ERROR_CALLBACK_SUPPORT_H_ #define SQL_TEST_ERROR_CALLBACK_SUPPORT_H_ +#include "base/macros.h" #include "sql/connection.h" namespace sql { diff --git a/sql/test/sql_test_base.h b/sql/test/sql_test_base.h index ebe9048..fcc40c0 100644 --- a/sql/test/sql_test_base.h +++ b/sql/test/sql_test_base.h @@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "sql/connection.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc index 16f2a7e..40cbe1d 100644 --- a/sql/test/test_helpers.cc +++ b/sql/test/test_helpers.cc @@ -4,6 +4,9 @@ #include "sql/test/test_helpers.h" +#include +#include + #include #include "base/files/file_util.h" diff --git a/sql/test/test_helpers.h b/sql/test/test_helpers.h index b2cecb0..71f7c3c 100644 --- a/sql/test/test_helpers.h +++ b/sql/test/test_helpers.h @@ -5,6 +5,9 @@ #ifndef SQL_TEST_TEST_HELPERS_H_ #define SQL_TEST_TEST_HELPERS_H_ +#include +#include + #include #include "base/compiler_specific.h" -- cgit v1.1