From be005e17bb39b2ddadf37cd72e61bf18772aa911 Mon Sep 17 00:00:00 2001 From: Lei Jin Date: Tue, 18 Nov 2014 20:41:29 -0800 Subject: [PATCH] fix clang compilation Summary: as title --- util/options_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/util/options_test.cc b/util/options_test.cc index b2087608f..cd456a0ae 100644 --- a/util/options_test.cc +++ b/util/options_test.cc @@ -302,24 +302,24 @@ TEST(OptionsTest, GetOptionsFromStringTest) { ASSERT_TRUE(GetColumnFamilyOptionsFromString(base_cf_opt, "memtable_prefix_bloom_bits=14k;max_write_buffer_number=-15K", &new_cf_opt)); - ASSERT_EQ(new_cf_opt.memtable_prefix_bloom_bits, 14*1024); + ASSERT_EQ(new_cf_opt.memtable_prefix_bloom_bits, 14UL*1024UL); ASSERT_EQ(new_cf_opt.max_write_buffer_number, -15*1024); // Units (m) ASSERT_TRUE(GetColumnFamilyOptionsFromString(base_cf_opt, "max_write_buffer_number=16m;inplace_update_num_locks=17M", &new_cf_opt)); ASSERT_EQ(new_cf_opt.max_write_buffer_number, 16*1024*1024); - ASSERT_EQ(new_cf_opt.inplace_update_num_locks, 17*1024*1024); + ASSERT_EQ(new_cf_opt.inplace_update_num_locks, 17*1024UL*1024UL); // Units (g) ASSERT_TRUE(GetColumnFamilyOptionsFromString(base_cf_opt, "write_buffer_size=18g;arena_block_size=19G", &new_cf_opt)); - ASSERT_EQ(new_cf_opt.write_buffer_size, 18*1024LL*1024LL*1024LL); - ASSERT_EQ(new_cf_opt.arena_block_size, 19*1024LL*1024LL*1024LL); + ASSERT_EQ(new_cf_opt.write_buffer_size, 18*1024UL*1024UL*1024UL); + ASSERT_EQ(new_cf_opt.arena_block_size, 19*1024UL*1024UL*1024UL); // Units (t) ASSERT_TRUE(GetColumnFamilyOptionsFromString(base_cf_opt, "write_buffer_size=20t;arena_block_size=21T", &new_cf_opt)); - ASSERT_EQ(new_cf_opt.write_buffer_size, 20*1024LL*1024LL*1024LL*1024LL); - ASSERT_EQ(new_cf_opt.arena_block_size, 21*1024LL*1024LL*1024LL*1024LL); + ASSERT_EQ(new_cf_opt.write_buffer_size, 20*1024UL*1024UL*1024UL*1024UL); + ASSERT_EQ(new_cf_opt.arena_block_size, 21*1024UL*1024UL*1024UL*1024UL); } } // namespace rocksdb