From b7fb8429bb3bef3ece4692a49af80792bdb62d8f Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Thu, 21 Nov 2013 15:09:46 +0000 Subject: [PATCH] Fixed some warnings --- gtsam/nonlinear/tests/testValues.cpp | 34 +++++++++---------- .../nonlinear/tests/testWhiteNoiseFactor.cpp | 2 +- .../tests/testSymbolicConditional.cpp | 28 +++++++-------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gtsam/nonlinear/tests/testValues.cpp b/gtsam/nonlinear/tests/testValues.cpp index 374cd045e..55faf61ca 100644 --- a/gtsam/nonlinear/tests/testValues.cpp +++ b/gtsam/nonlinear/tests/testValues.cpp @@ -316,14 +316,14 @@ TEST(Values, filter) { // Filter by key int i = 0; Values::Filtered filtered = values.filter(boost::bind(std::greater_equal(), _1, 2)); - EXPECT_LONGS_EQUAL(2, filtered.size()); + EXPECT_LONGS_EQUAL(2, (long)filtered.size()); BOOST_FOREACH(const Values::Filtered<>::KeyValuePair& key_value, filtered) { if(i == 0) { - LONGS_EQUAL(2, key_value.key); + LONGS_EQUAL(2, (long)key_value.key); EXPECT(typeid(Pose2) == typeid(key_value.value)); EXPECT(assert_equal(pose2, dynamic_cast(key_value.value))); } else if(i == 1) { - LONGS_EQUAL(3, key_value.key); + LONGS_EQUAL(3, (long)key_value.key); EXPECT(typeid(Pose3) == typeid(key_value.value)); EXPECT(assert_equal(pose3, dynamic_cast(key_value.value))); } else { @@ -331,7 +331,7 @@ TEST(Values, filter) { } ++ i; } - EXPECT_LONGS_EQUAL(2, i); + EXPECT_LONGS_EQUAL(2, (long)i); // construct a values with the view Values actualSubValues1(filtered); @@ -343,20 +343,20 @@ TEST(Values, filter) { // Filter by type i = 0; Values::ConstFiltered pose_filtered = values.filter(); - EXPECT_LONGS_EQUAL(2, pose_filtered.size()); + EXPECT_LONGS_EQUAL(2, (long)pose_filtered.size()); BOOST_FOREACH(const Values::ConstFiltered::KeyValuePair& key_value, pose_filtered) { if(i == 0) { - EXPECT_LONGS_EQUAL(1, key_value.key); + EXPECT_LONGS_EQUAL(1, (long)key_value.key); EXPECT(assert_equal(pose1, key_value.value)); } else if(i == 1) { - EXPECT_LONGS_EQUAL(3, key_value.key); + EXPECT_LONGS_EQUAL(3, (long)key_value.key); EXPECT(assert_equal(pose3, key_value.value)); } else { EXPECT(false); } ++ i; } - EXPECT_LONGS_EQUAL(2, i); + EXPECT_LONGS_EQUAL(2, (long)i); // construct a values with the view Values actualSubValues2(pose_filtered); @@ -382,17 +382,17 @@ TEST(Values, Symbol_filter) { int i = 0; BOOST_FOREACH(const Values::Filtered::KeyValuePair& key_value, values.filter(Symbol::ChrTest('y'))) { if(i == 0) { - LONGS_EQUAL(Symbol('y',1), key_value.key); + LONGS_EQUAL(Symbol('y', 1), (long)key_value.key); EXPECT(assert_equal(pose1, dynamic_cast(key_value.value))); } else if(i == 1) { - LONGS_EQUAL(Symbol('y',3), key_value.key); + LONGS_EQUAL(Symbol('y', 3), (long)key_value.key); EXPECT(assert_equal(pose3, dynamic_cast(key_value.value))); } else { EXPECT(false); } ++ i; } - LONGS_EQUAL(2, i); + LONGS_EQUAL(2, (long)i); } /* ************************************************************************* */ @@ -403,16 +403,16 @@ TEST(Values, Destructors) { { TestValue value1; TestValue value2; - LONGS_EQUAL(2, TestValueData::ConstructorCount); - LONGS_EQUAL(0, TestValueData::DestructorCount); + LONGS_EQUAL(2, (long)TestValueData::ConstructorCount); + LONGS_EQUAL(0, (long)TestValueData::DestructorCount); values.insert(0, value1); values.insert(1, value2); } - LONGS_EQUAL(4, TestValueData::ConstructorCount); - LONGS_EQUAL(2, TestValueData::DestructorCount); + LONGS_EQUAL(4, (long)TestValueData::ConstructorCount); + LONGS_EQUAL(2, (long)TestValueData::DestructorCount); } - LONGS_EQUAL(4, TestValueData::ConstructorCount); - LONGS_EQUAL(4, TestValueData::DestructorCount); + LONGS_EQUAL(4, (long)TestValueData::ConstructorCount); + LONGS_EQUAL(4, (long)TestValueData::DestructorCount); } /* ************************************************************************* */ diff --git a/gtsam/nonlinear/tests/testWhiteNoiseFactor.cpp b/gtsam/nonlinear/tests/testWhiteNoiseFactor.cpp index a141641e3..1cd042428 100644 --- a/gtsam/nonlinear/tests/testWhiteNoiseFactor.cpp +++ b/gtsam/nonlinear/tests/testWhiteNoiseFactor.cpp @@ -30,7 +30,7 @@ TEST( WhiteNoiseFactor, constructor ) double z = 0.1; Key meanKey=1, precisionKey=2; WhiteNoiseFactor factor(z,meanKey, precisionKey); - LONGS_EQUAL(2,factor.dim()); + LONGS_EQUAL(2, (long)factor.dim()); } /* ************************************************************************* */ diff --git a/gtsam/symbolic/tests/testSymbolicConditional.cpp b/gtsam/symbolic/tests/testSymbolicConditional.cpp index c173f4a74..298ebb8a6 100644 --- a/gtsam/symbolic/tests/testSymbolicConditional.cpp +++ b/gtsam/symbolic/tests/testSymbolicConditional.cpp @@ -29,40 +29,40 @@ using namespace gtsam; TEST( SymbolicConditional, empty ) { SymbolicConditional c0; - LONGS_EQUAL(0,c0.nrFrontals()) - LONGS_EQUAL(0,c0.nrParents()) + LONGS_EQUAL(0, (long)c0.nrFrontals()); + LONGS_EQUAL(0, (long)c0.nrParents()); } /* ************************************************************************* */ TEST( SymbolicConditional, noParents ) { SymbolicConditional c0(0); - LONGS_EQUAL(1,c0.nrFrontals()) - LONGS_EQUAL(0,c0.nrParents()) + LONGS_EQUAL(1, (long)c0.nrFrontals()); + LONGS_EQUAL(0, (long)c0.nrParents()); } /* ************************************************************************* */ TEST( SymbolicConditional, oneParents ) { SymbolicConditional c0(0,1); - LONGS_EQUAL(1,c0.nrFrontals()) - LONGS_EQUAL(1,c0.nrParents()) + LONGS_EQUAL(1, (long)c0.nrFrontals()); + LONGS_EQUAL(1, (long)c0.nrParents()); } /* ************************************************************************* */ TEST( SymbolicConditional, twoParents ) { SymbolicConditional c0(0,1,2); - LONGS_EQUAL(1,c0.nrFrontals()) - LONGS_EQUAL(2,c0.nrParents()) + LONGS_EQUAL(1, (long)c0.nrFrontals()); + LONGS_EQUAL(2, (long)c0.nrParents()); } /* ************************************************************************* */ TEST( SymbolicConditional, threeParents ) { SymbolicConditional c0(0,1,2,3); - LONGS_EQUAL(1,c0.nrFrontals()) - LONGS_EQUAL(3,c0.nrParents()) + LONGS_EQUAL(1, (long)c0.nrFrontals()); + LONGS_EQUAL(3, (long)c0.nrParents()); } /* ************************************************************************* */ @@ -70,8 +70,8 @@ TEST( SymbolicConditional, fourParents ) { SymbolicConditional c0 = SymbolicConditional::FromKeys( list_of(0)(1)(2)(3)(4), 1); - LONGS_EQUAL(1,c0.nrFrontals()) - LONGS_EQUAL(4,c0.nrParents()) + LONGS_EQUAL(1, (long)c0.nrFrontals()); + LONGS_EQUAL(4, (long)c0.nrParents()); } /* ************************************************************************* */ @@ -80,8 +80,8 @@ TEST( SymbolicConditional, FromRange ) SymbolicConditional::shared_ptr c0 = boost::make_shared( SymbolicConditional::FromKeys(list_of(1)(2)(3)(4)(5), 2)); - LONGS_EQUAL(2,c0->nrFrontals()) - LONGS_EQUAL(3,c0->nrParents()) + LONGS_EQUAL(2, (long)c0->nrFrontals()); + LONGS_EQUAL(3, (long)c0->nrParents()); } /* ************************************************************************* */