[kido] 02/02: Fix patch

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository kido.

commit 3aade16b9bbf54fa096d5f86998bc275f17c1701
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Sep 5 22:34:41 2016 +0000

    Fix patch
---
 debian/patches/0003-use-std-shared-pointers.patch | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0003-use-std-shared-pointers.patch b/debian/patches/0003-use-std-shared-pointers.patch
index 0d2e4d1..c5ca63c 100644
--- a/debian/patches/0003-use-std-shared-pointers.patch
+++ b/debian/patches/0003-use-std-shared-pointers.patch
@@ -16,13 +16,18 @@ index bf4e7e4..d6e5c83 100644
      switch (shape->getShapeType())
      {
 diff --git a/kido/collision/fcl/FCLTypes.hpp b/kido/collision/fcl/FCLTypes.hpp
-index 3463d37..13b68f5 100644
+index 3463d37..f6a3d94 100644
 --- a/kido/collision/fcl/FCLTypes.hpp
 +++ b/kido/collision/fcl/FCLTypes.hpp
-@@ -42,6 +42,14 @@
+@@ -42,6 +42,19 @@
  #include <fcl/math/matrix_3f.h>
  #include <fcl/math/transform.h>
  
++#define FCL_VERSION_AT_LEAST(x,y,z) \
++   (FCL_MAJOR_VERSION > x || (FCL_MAJOR_VERSION >= x && \
++   (FCL_MINOR_VERSION > y || (FCL_MINOR_VERSION >= y && \
++FCL_PATCH_VERSION >= z))))
++
 +#if FCL_VERSION_AT_LEAST(0,5,0)
 +  template <class T> using fcl_shared_ptr = std::shared_ptr<T>;
 +  template <class T> using fcl_weak_ptr = std::weak_ptr<T>;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/kido.git