[kido] 01/02: Use std::shared instead of boost::shared

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Mon Aug 29 01:09:24 UTC 2016


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

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

commit ae63d19c975f19395161fc8985353a4c4ac3f2aa
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 29 01:01:37 2016 +0000

    Use std::shared instead of boost::shared
---
 debian/patches/0003-use-std-shared-pointers.patch | 39 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/0003-use-std-shared-pointers.patch b/debian/patches/0003-use-std-shared-pointers.patch
new file mode 100644
index 0000000..e127308
--- /dev/null
+++ b/debian/patches/0003-use-std-shared-pointers.patch
@@ -0,0 +1,39 @@
+diff --git a/kido/collision/fcl/FCLCollisionNode.cpp b/kido/collision/fcl/FCLCollisionNode.cpp
+index bf4e7e4..d07c1ba 100644
+--- a/kido/collision/fcl/FCLCollisionNode.cpp
++++ b/kido/collision/fcl/FCLCollisionNode.cpp
+@@ -351,7 +351,7 @@ FCLCollisionNode::FCLCollisionNode(dynamics::BodyNode* _bodyNode)
+   {
+     dynamics::ShapePtr shape = _bodyNode->getCollisionShape(i);
+ 
+-    boost::shared_ptr<fcl::CollisionGeometry> fclCollGeom;
++    std::shared_ptr<fcl::CollisionGeometry> fclCollGeom;
+ 
+     switch (shape->getShapeType())
+     {
+diff --git a/kido/utils/urdf/KidoLoader.cpp b/kido/utils/urdf/KidoLoader.cpp
+index a7e50c5..4477525 100644
+--- a/kido/utils/urdf/KidoLoader.cpp
++++ b/kido/utils/urdf/KidoLoader.cpp
+@@ -23,7 +23,7 @@
+ #include "kido/simulation/World.hpp"
+ #include "kido/utils/urdf/urdf_world_parser.hpp"
+ 
+-using ModelInterfacePtr = boost::shared_ptr<urdf::ModelInterface>;
++using ModelInterfacePtr = std::shared_ptr<urdf::ModelInterface>;
+ 
+ namespace kido {
+ namespace utils {
+diff --git a/kido/utils/urdf/urdf_world_parser.hpp b/kido/utils/urdf/urdf_world_parser.hpp
+index 74227bf..96a17bf 100644
+--- a/kido/utils/urdf/urdf_world_parser.hpp
++++ b/kido/utils/urdf/urdf_world_parser.hpp
+@@ -63,7 +63,7 @@ public:
+   /// Copy over a standard urdfEntity
+   Entity(const urdf::Entity& urdfEntity);
+ 
+-  boost::shared_ptr<urdf::ModelInterface> model;
++  std::shared_ptr<urdf::ModelInterface> model;
+   urdf::Pose origin;
+   urdf::Twist twist;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4b47a81..44d15a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-respect-cflags.patch
 0002-do-not-use-msse2.patch
+0003-use-std-shared-pointers.patch

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



More information about the debian-science-commits mailing list