Rebase from 'upstream'

ros-gbp · Feb 14, 2019 · 8ff5750 · 8ff5750
1 parent d20ae61
commit 8ff5750
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package realtime_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.13.1 (2019-02-14)
+-------------------
+* Fix actionlib regression
+* Contributors: Bence Magyar
+
 1.13.0 (2019-02-11)
 -------------------
 * Update readme

diff --git a/include/realtime_tools/realtime_server_goal_handle.h b/include/realtime_tools/realtime_server_goal_handle.h
@@ -47,8 +47,8 @@ class RealtimeServerGoalHandle
   ACTION_DEFINITION(Action);
 
   typedef actionlib::ServerGoalHandle<Action> GoalHandle;
-  typedef std::shared_ptr<Result> ResultPtr;
-  typedef std::shared_ptr<Feedback> FeedbackPtr;
+  typedef boost::shared_ptr<Result> ResultPtr;
+  typedef boost::shared_ptr<Feedback> FeedbackPtr;
 
   uint8_t state_;
 

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>realtime_tools</name>
-  <version>1.13.0</version>
+  <version>1.13.1</version>
   <description>Contains a set of tools that can be used from a hard
     realtime thread, without breaking the realtime behavior.  The
     tools currently only provides the realtime publisher, which makes