Suppress more warnings per Apple Clang 4.0.0

personalrobotics · Apr 28, 2017 · b8f60cf · b8f60cf
1 parent f7c93b3
commit b8f60cf
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 38 deletions.
diff --git a/tests/constraint/test_DartHelpers.cpp b/tests/constraint/test_DartHelpers.cpp
@@ -29,13 +29,6 @@ using aikido::constraint::createProjectableBoundsFor;
 using aikido::constraint::createTestableBoundsFor;
 using aikido::constraint::createSampleableBoundsFor;
 
-static inline Vector1d make_vector(double _x)
-{
-  Vector1d matrix;
-  matrix(0, 0) = _x;
-  return matrix;
-}
-
 //=============================================================================
 class RnJointHelpersTests : public ::testing::Test
 {

diff --git a/tests/constraint/test_TSR.cpp b/tests/constraint/test_TSR.cpp
@@ -17,11 +17,6 @@ using dart::common::make_unique;
 
 using DefaultRNG = RNGWrapper<std::default_random_engine>;
 
-static inline std::unique_ptr<DefaultRNG> make_rng()
-{
-  return make_unique<RNGWrapper<std::default_random_engine>>(0);
-}
-
 TEST(TSR, InitializesToIdentity)
 {
   TSR tsr;
@@ -468,6 +463,3 @@ TEST(TSR, getSE3EqualToGetStateSpace)
 
   EXPECT_EQ(se3space, space);
 }
-
-
-
diff --git a/tests/control/test_BarrettFingerKinematicSimulationPositionCommandExecutor.cpp b/tests/control/test_BarrettFingerKinematicSimulationPositionCommandExecutor.cpp
@@ -24,7 +24,6 @@ static BodyNode::Properties create_BodyNodeProperties(const std::string& _name)
   return properties;
 }
 
-const static std::chrono::milliseconds stepTime{100};
 const static std::chrono::nanoseconds waitTime{1};
 
 class BarrettFingerKinematicSimulationPositionCommandExecutorTest : public testing::Test

diff --git a/tests/control/test_BarrettFingerKinematicSimulationSpreadCommandExecutor.cpp b/tests/control/test_BarrettFingerKinematicSimulationSpreadCommandExecutor.cpp
@@ -25,7 +25,6 @@ static BodyNode::Properties create_BodyNodeProperties(const std::string& _name)
   return properties;
 }
 
-const static std::chrono::milliseconds stepTime{100};
 const static std::chrono::nanoseconds waitTime{1};
 
 class BarrettFingerKinematicSimulationSpreadCommandExecutorTest : public testing::Test

diff --git a/tests/control/test_BarrettHandKinematicSimulationPositionCommandExecutor.cpp b/tests/control/test_BarrettHandKinematicSimulationPositionCommandExecutor.cpp
@@ -25,8 +25,6 @@ using namespace dart::dynamics;
 using namespace dart::collision;
 using namespace dart::simulation;
 
-const static std::chrono::milliseconds stepTime{100};
-
 static BodyNode::Properties create_BodyNodeProperties(const std::string& _name)
 {
   BodyNode::Properties properties;

diff --git a/tests/planner/ompl/test_GoalRegion.cpp b/tests/planner/ompl/test_GoalRegion.cpp
@@ -23,7 +23,7 @@ class GoalRegionTest : public PlannerTest
 
   }
   std::shared_ptr<GeometricStateSpace> gSpace;
-  boost::shared_ptr<::ompl::base::SpaceInformation> si;
+  ::ompl::base::SpaceInformationPtr si;
 };
 
 TEST_F(GoalRegionTest, ThrowsOnNullSpaceInformation)
@@ -60,8 +60,7 @@ TEST_F(GoalRegionTest, ThrowsOnTestableGeneratorMismatch)
 TEST_F(GoalRegionTest, DifferentSample)
 {
   auto testable = std::make_shared<PassingConstraint>(stateSpace);
-  GoalRegion gr(si, std::move(testable),
-                std::move(sampler->createSampleGenerator()));
+  GoalRegion gr(si, std::move(testable), sampler->createSampleGenerator());
 
   auto state1 = si->allocState();
   auto state2 = si->allocState();
@@ -78,8 +77,7 @@ TEST_F(GoalRegionTest, DifferentSample)
 TEST_F(GoalRegionTest, ValidSample)
 {
   auto testable = std::make_shared<PassingConstraint>(stateSpace);
-  GoalRegion gr(si, std::move(testable),
-                std::move(sampler->createSampleGenerator()));
+  GoalRegion gr(si, std::move(testable), sampler->createSampleGenerator());
 
   auto state1 = si->allocState();
 

diff --git a/tests/planner/ompl/test_MotionValidator.cpp b/tests/planner/ompl/test_MotionValidator.cpp
@@ -9,6 +9,7 @@
 
 using aikido::statespace::dart::MetaSkeletonStateSpace;
 using aikido::planner::ompl::MotionValidator;
+using aikido::planner::ompl::ompl_make_shared;
 
 /// This test creates a world with a translational robot
 /// and a .2x.2x.2 block obstacle at the origin
@@ -28,8 +29,8 @@ class MotionValidatorTest : public ::testing::Test
         std::make_shared<MockTranslationalRobotConstraint>(
             stateSpace, Eigen::Vector3d(-0.1, -0.1, -0.1),
             Eigen::Vector3d(0.1, 0.1, 0.1));
-    ::ompl::base::StateValidityCheckerPtr vchecker =
-          boost::make_shared<aikido::planner::ompl::StateValidityChecker>(
+    auto vchecker =
+        ompl_make_shared<aikido::planner::ompl::StateValidityChecker>(
             si, mockCollisionConstraint);
     si->setStateValidityChecker(vchecker);
     validator = std::make_shared<MotionValidator>(si, 0.1);

diff --git a/tests/planner/ompl/test_OMPLPlanner.cpp b/tests/planner/ompl/test_OMPLPlanner.cpp
@@ -15,6 +15,7 @@ using StateSpace = aikido::statespace::dart::MetaSkeletonStateSpace;
 using aikido::planner::ompl::getSpaceInformation;
 using aikido::planner::ompl::CRRT;
 using aikido::planner::ompl::CRRTConnect;
+using aikido::planner::ompl::ompl_dynamic_pointer_cast;
 
 TEST_F(PlannerTest, PlanToConfiguration)
 {
@@ -471,7 +472,7 @@ TEST_F(PlannerTest, GetSpaceInformationCreatesGeometricStateSpace)
       std::move(sampler), std::move(collConstraint),
       std::move(boundsConstraint), std::move(boundsProjection), 0.1);
 
-  auto ss = boost::dynamic_pointer_cast<aikido::planner::ompl::GeometricStateSpace>(
+  auto ss = ompl_dynamic_pointer_cast<aikido::planner::ompl::GeometricStateSpace>(
       si->getStateSpace());
   EXPECT_FALSE(ss == nullptr);
 }
@@ -483,7 +484,7 @@ TEST_F(PlannerTest, GetSpaceInformationCreatesValidityChecker)
       std::move(sampler), std::move(collConstraint),
       std::move(boundsConstraint), std::move(boundsProjection), 0.1);
 
-  auto vc = boost::dynamic_pointer_cast<aikido::planner::ompl::StateValidityChecker>(
+  auto vc = ompl_dynamic_pointer_cast<aikido::planner::ompl::StateValidityChecker>(
       si->getStateValidityChecker());
   EXPECT_FALSE(vc == nullptr);
 }
@@ -495,8 +496,7 @@ TEST_F(PlannerTest, GetSpaceInformationCreatesMotionValidator)
       std::move(sampler), std::move(collConstraint),
       std::move(boundsConstraint), std::move(boundsProjection), 0.1);
 
-  auto mvalidator = boost::dynamic_pointer_cast<aikido::planner::ompl::MotionValidator>(
+  auto mvalidator = ompl_dynamic_pointer_cast<aikido::planner::ompl::MotionValidator>(
       si->getMotionValidator());
   EXPECT_FALSE(mvalidator == nullptr);
 }
-
diff --git a/tests/planner/ompl/test_StateSampler.cpp b/tests/planner/ompl/test_StateSampler.cpp
@@ -22,7 +22,7 @@ class StateSamplerTest : public PlannerTest
 
 TEST_F(StateSamplerTest, ThrowsOnNullStateSpace)
 {
-  EXPECT_THROW(StateSampler(0, std::move(sampler->createSampleGenerator())),
+  EXPECT_THROW(StateSampler(0, sampler->createSampleGenerator()),
                std::invalid_argument);
 }
 
@@ -60,8 +60,7 @@ TEST_F(StateSamplerTest, SampleUniformGeneratorFailsSample)
 
 TEST_F(StateSamplerTest, SampleUniformValid)
 {
-  StateSampler ssampler(gSpace.get(),
-                        std::move(sampler->createSampleGenerator()));
+  StateSampler ssampler(gSpace.get(), sampler->createSampleGenerator());
   auto s1 = gSpace->allocState()->as<GeometricStateSpace::StateType>();
   auto s2 = gSpace->allocState()->as<GeometricStateSpace::StateType>();
 
@@ -76,8 +75,7 @@ TEST_F(StateSamplerTest, SampleUniformValid)
 
 TEST_F(StateSamplerTest, SampleUniformNearAlwaysThrows)
 {
-  StateSampler ssampler(gSpace.get(),
-                        std::move(sampler->createSampleGenerator()));
+  StateSampler ssampler(gSpace.get(), sampler->createSampleGenerator());
   auto s1 = gSpace->allocState()->as<GeometricStateSpace::StateType>();
   auto s2 = gSpace->allocState()->as<GeometricStateSpace::StateType>();
 
@@ -89,8 +87,7 @@ TEST_F(StateSamplerTest, SampleUniformNearAlwaysThrows)
 
 TEST_F(StateSamplerTest, SampleGaussianAlwaysThrows)
 {
-  StateSampler ssampler(gSpace.get(),
-                        std::move(sampler->createSampleGenerator()));
+  StateSampler ssampler(gSpace.get(), sampler->createSampleGenerator());
   auto s1 = gSpace->allocState()->as<GeometricStateSpace::StateType>();
   auto s2 = gSpace->allocState()->as<GeometricStateSpace::StateType>();
 

diff --git a/tests/planner/ompl/test_ValidityChecker.cpp b/tests/planner/ompl/test_ValidityChecker.cpp
@@ -21,7 +21,7 @@ class StateValidityCheckerTest : public PlannerTest
       boundsConstraint, boundsProjection, 0.1);
   }
   std::shared_ptr<GeometricStateSpace> gSpace;
-  boost::shared_ptr<::ompl::base::SpaceInformation> si;
+  ::ompl::base::SpaceInformationPtr si;
 };
 
 TEST_F(StateValidityCheckerTest, ThrowsOnNullSpaceInformation)