the compiler complains about solver tests using pointers as bool
authorqipeng <pengrobertqi@163.com>
Fri, 1 Aug 2014 15:10:19 +0000 (08:10 -0700)
committerqipeng <pengrobertqi@163.com>
Fri, 1 Aug 2014 15:10:19 +0000 (08:10 -0700)
src/caffe/test/test_solver.cpp

index 9e087b0..8b241da 100644 (file)
@@ -96,14 +96,14 @@ TYPED_TEST(SolverTest, TestInitTrainTestNets) {
      "  } "
      "} ";
   this->InitSolverFromProtoString(proto);
-  ASSERT_TRUE(this->solver_->net());
-  EXPECT_TRUE(this->solver_->net()->has_layer("loss"));
-  EXPECT_FALSE(this->solver_->net()->has_layer("accuracy"));
+  ASSERT_TRUE((bool)this->solver_->net());
+  EXPECT_TRUE((bool)this->solver_->net()->has_layer("loss"));
+  EXPECT_FALSE((bool)this->solver_->net()->has_layer("accuracy"));
   ASSERT_EQ(2, this->solver_->test_nets().size());
-  EXPECT_TRUE(this->solver_->test_nets()[0]->has_layer("loss"));
-  EXPECT_TRUE(this->solver_->test_nets()[0]->has_layer("accuracy"));
-  EXPECT_FALSE(this->solver_->test_nets()[1]->has_layer("loss"));
-  EXPECT_TRUE(this->solver_->test_nets()[1]->has_layer("accuracy"));
+  EXPECT_TRUE((bool)this->solver_->test_nets()[0]->has_layer("loss"));
+  EXPECT_TRUE((bool)this->solver_->test_nets()[0]->has_layer("accuracy"));
+  EXPECT_FALSE((bool)this->solver_->test_nets()[1]->has_layer("loss"));
+  EXPECT_TRUE((bool)this->solver_->test_nets()[1]->has_layer("accuracy"));
 }
 
 }  // namespace caffe