Merge pull request XRPLF#282 from Chilledheart/develop

igorcanadi · igorcanadi · commit 24f034bf498d · 2014-09-12T14:37:45.000-07:00
Fix build issue under macosx
diff --git a/db/db_test.cc b/db/db_test.cc
@@ -6036,22 +6036,22 @@ TEST(DBTest, BloomFilterWrapper) {
   }
   // Add a large key to make the file contain wide range
   ASSERT_OK(Put(1, Key(maxKey + 55555), Key(maxKey + 55555)));
-  ASSERT_EQ(0, policy->GetCounter());
+  ASSERT_EQ(0U, policy->GetCounter());
   Flush(1);
 
   // Check if they can be found
   for (int i = 0; i < maxKey; i++) {
     ASSERT_EQ(Key(i), Get(1, Key(i)));
   }
   ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), 0);
-  ASSERT_EQ(maxKey, policy->GetCounter());
+  ASSERT_EQ(1U * maxKey, policy->GetCounter());
 
   // Check if filter is useful
   for (int i = 0; i < maxKey; i++) {
     ASSERT_EQ("NOT_FOUND", Get(1, Key(i+33333)));
   }
   ASSERT_GE(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), maxKey*0.98);
-  ASSERT_EQ(2 * maxKey, policy->GetCounter());
+  ASSERT_EQ(2U * maxKey, policy->GetCounter());
 }
 
 TEST(DBTest, SnapshotFiles) {

Original file line number	Diff line number	Diff line change
`@@ -6036,22 +6036,22 @@ TEST(DBTest, BloomFilterWrapper) {`
`6036`	`6036`	`}`
`6037`	`6037`	`// Add a large key to make the file contain wide range`
`6038`	`6038`	`ASSERT_OK(Put(1, Key(maxKey + 55555), Key(maxKey + 55555)));`
`6039`		`- ASSERT_EQ(0, policy->GetCounter());`
	`6039`	`+ ASSERT_EQ(0U, policy->GetCounter());`
`6040`	`6040`	`Flush(1);`
`6041`	`6041`
`6042`	`6042`	`// Check if they can be found`
`6043`	`6043`	`for (int i = 0; i < maxKey; i++) {`
`6044`	`6044`	`ASSERT_EQ(Key(i), Get(1, Key(i)));`
`6045`	`6045`	`}`
`6046`	`6046`	`ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), 0);`
`6047`		`- ASSERT_EQ(maxKey, policy->GetCounter());`
	`6047`	`+ ASSERT_EQ(1U * maxKey, policy->GetCounter());`
`6048`	`6048`
`6049`	`6049`	`// Check if filter is useful`
`6050`	`6050`	`for (int i = 0; i < maxKey; i++) {`
`6051`	`6051`	`ASSERT_EQ("NOT_FOUND", Get(1, Key(i+33333)));`
`6052`	`6052`	`}`
`6053`	`6053`	`ASSERT_GE(TestGetTickerCount(options, BLOOM_FILTER_USEFUL), maxKey*0.98);`
`6054`		`- ASSERT_EQ(2 * maxKey, policy->GetCounter());`
	`6054`	`+ ASSERT_EQ(2U * maxKey, policy->GetCounter());`
`6055`	`6055`	`}`
`6056`	`6056`
`6057`	`6057`	`TEST(DBTest, SnapshotFiles) {`