summaryrefslogtreecommitdiffstats
path: root/sql/test
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2014-12-12 14:25:38 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-12 22:26:02 +0000
commit2209d5e44d1271b3c60d7517639697759b1f5275 (patch)
tree6683fd29bc21608d242fac10bec67ff448fcd7f4 /sql/test
parentfc41a66cb9b6e1e1ad827248101d5870ac9a2e27 (diff)
downloadchromium_src-2209d5e44d1271b3c60d7517639697759b1f5275.zip
chromium_src-2209d5e44d1271b3c60d7517639697759b1f5275.tar.gz
chromium_src-2209d5e44d1271b3c60d7517639697759b1f5275.tar.bz2
Misc. warning fixes/cleanup
BUG=81439 TEST=none Review URL: https://codereview.chromium.org/777853003 Cr-Commit-Position: refs/heads/master@{#308182}
Diffstat (limited to 'sql/test')
-rw-r--r--sql/test/test_helpers.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc
index 8b20256..72d42c6 100644
--- a/sql/test/test_helpers.cc
+++ b/sql/test/test_helpers.cc
@@ -92,7 +92,8 @@ bool CorruptSizeInHeader(const base::FilePath& db_path) {
const unsigned page_size = ReadBigEndian(header + kPageSizeOffset, 2);
// One larger than the expected size.
- const unsigned page_count = (db_size + page_size) / page_size;
+ const unsigned page_count =
+ static_cast<unsigned>((db_size + page_size) / page_size);
WriteBigEndian(page_count, header + kPageCountOffset, 4);
// Update change count so outstanding readers know the info changed.
@@ -212,7 +213,7 @@ bool CountTableRows(sql::Connection* db, const char* table, size_t* count) {
if (!s.Step())
return false;
- *count = s.ColumnInt64(0);
+ *count = static_cast<size_t>(s.ColumnInt64(0));
return true;
}