From d78a8de102111525ae66a4536093d58823fd7129 Mon Sep 17 00:00:00 2001 From: qipeng Date: Fri, 1 Aug 2014 08:28:43 -0700 Subject: [PATCH] lint --- src/caffe/test/test_solver.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/caffe/test/test_solver.cpp b/src/caffe/test/test_solver.cpp index 8b241da..20bad95 100644 --- a/src/caffe/test/test_solver.cpp +++ b/src/caffe/test/test_solver.cpp @@ -96,14 +96,18 @@ TYPED_TEST(SolverTest, TestInitTrainTestNets) { " } " "} "; this->InitSolverFromProtoString(proto); - 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_TRUE(static_cast(this->solver_->net())); + EXPECT_TRUE(static_cast(this->solver_->net()->has_layer("loss"))); + EXPECT_FALSE(static_cast(this->solver_->net()->has_layer("accuracy"))); ASSERT_EQ(2, this->solver_->test_nets().size()); - 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")); + EXPECT_TRUE(static_cast( + this->solver_->test_nets()[0]->has_layer("loss"))); + EXPECT_TRUE(static_cast( + this->solver_->test_nets()[0]->has_layer("accuracy"))); + EXPECT_FALSE(static_cast( + this->solver_->test_nets()[1]->has_layer("loss"))); + EXPECT_TRUE(static_cast( + this->solver_->test_nets()[1]->has_layer("accuracy"))); } } // namespace caffe -- 2.7.4