From 60f84f53bb29b20657ce21e2dee6ae65b2c29fd8 Mon Sep 17 00:00:00 2001
From: Valenza Florian <fvalenza@laas.fr>
Date: Mon, 25 Jul 2016 09:31:44 +0200
Subject: [PATCH] [unittest] Fix compilation warning if no hpp-model-urdf is
found
Conflicts:
unittest/geom.cpp
---
unittest/geom.cpp | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/unittest/geom.cpp b/unittest/geom.cpp
index b0c001000..67934c241 100644
--- a/unittest/geom.cpp
+++ b/unittest/geom.cpp
@@ -113,19 +113,6 @@ struct Distance_t
// Distance and closest points on bodies.
double d_, x0_, y0_, z0_, x1_, y1_, z1_;
}; // struct Distance_t
-#endif
-std::ostream& operator<<(std::ostream& os, const std::pair < se3::Model, se3::GeometryModel >& robot)
-{
- os << "Nb collision objects = " << robot.second.ngeoms << std::endl;
-
- for(se3::GeometryModel::Index i=0;i<(se3::GeometryModel::Index)(robot.second.ngeoms);++i)
- {
- os << "Object n " << i << " : " << robot.second.geometryObjects[i].name << ": attached to joint = " << robot.second.geometryObjects[i].parent
- << "=" << robot.first.getJointName(robot.second.geometryObjects[i].parent) << std::endl;
- }
- return os;
-}
-
void loadHumanoidPathPlanerModel (const hpp::model::HumanoidRobotPtr_t& robot,
const std::string& rootJointType,
@@ -144,6 +131,9 @@ void loadHumanoidPathPlanerModel (const hpp::model::HumanoidRobotPtr_t& robot,
}
+#endif
+
+
BOOST_AUTO_TEST_SUITE ( GeomTest )
BOOST_AUTO_TEST_CASE ( simple_boxes )
--
GitLab