Skip to content
Snippets Groups Projects
Commit a8bc1a04 authored by isucan's avatar isucan
Browse files

apply patch from mark

git-svn-id: https://kforge.ros.org/fcl/fcl_ros@173 253336fb-580f-4252-a368-f3cef5a2a82b
parent d6e151bc
No related branches found
No related tags found
No related merge requests found
...@@ -148,7 +148,7 @@ public: ...@@ -148,7 +148,7 @@ public:
void leafTesting(int, int) const void leafTesting(int, int) const
{ {
FCL_REAL distance; FCL_REAL distance;
nsolver->shapeDistance(*model1, tf1, *model2, tf2, &distance); !nsolver->shapeDistance(*model1, tf1, *model2, tf2, &distance);
result->update(distance, model1, model2, DistanceResult::NONE, DistanceResult::NONE); result->update(distance, model1, model2, DistanceResult::NONE, DistanceResult::NONE);
} }
......
...@@ -98,7 +98,6 @@ TaylorModel TaylorModel::operator + (FCL_REAL d) const ...@@ -98,7 +98,6 @@ TaylorModel TaylorModel::operator + (FCL_REAL d) const
TaylorModel& TaylorModel::operator += (FCL_REAL d) TaylorModel& TaylorModel::operator += (FCL_REAL d)
{ {
coeffs_[0] += d; coeffs_[0] += d;
return *this;
} }
TaylorModel TaylorModel::operator + (const TaylorModel& other) const TaylorModel TaylorModel::operator + (const TaylorModel& other) const
......
...@@ -158,8 +158,6 @@ Vec3f getSupport(const ShapeBase* shape, const Vec3f& dir) ...@@ -158,8 +158,6 @@ Vec3f getSupport(const ShapeBase* shape, const Vec3f& dir)
return Vec3f(0, 0, 0); return Vec3f(0, 0, 0);
} }
break; break;
default:
; // nothing
} }
return Vec3f(0, 0, 0); return Vec3f(0, 0, 0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment