aboutsummaryrefslogtreecommitdiff
path: root/src/platforms
diff options
context:
space:
mode:
Diffstat (limited to 'src/platforms')
-rw-r--r--src/platforms/px4_nodehandle.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/platforms/px4_nodehandle.h b/src/platforms/px4_nodehandle.h
index 809d0eb15..9bbf5c724 100644
--- a/src/platforms/px4_nodehandle.h
+++ b/src/platforms/px4_nodehandle.h
@@ -40,6 +40,7 @@
#include <px4_subscriber.h>
#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
#include "ros/ros.h"
+#include <list>
#endif
namespace px4
@@ -48,12 +49,21 @@ namespace px4
class NodeHandle : private ros::NodeHandle
{
public:
+ NodeHandle () :
+ ros::NodeHandle(),
+ _subs()
+ {}
+
template<class M>
- Subscriber* subscribe(const char *topic, void(*fp)(M)) {
+ Subscriber subscribe(const char *topic, void(*fp)(M)) {
ros::Subscriber ros_sub = ros::NodeHandle::subscribe(topic, 1000, fp);
//XXX create list here, for ros and nuttx
- return new Subscriber(ros_sub);
+ Subscriber sub(ros_sub);
+ _subs.push_back(sub);
+ return sub;
}
+private:
+ std::list<Subscriber> _subs;
};
#else
class NodeHandle