move uorb::subscriptionbase into constructor of subscriber

This commit is contained in:
Thomas Gubler
2015-01-23 07:17:06 +01:00
parent 1ad6e00234
commit 2dfd30c25e
2 changed files with 10 additions and 13 deletions
+7 -6
View File
@@ -183,12 +183,14 @@ public:
* Construct SubscriberUORB by providing orb meta data without callback
* @param interval Minimal interval between calls to callback
*/
SubscriberUORB(uORB::SubscriptionBase * uorb_sub, unsigned interval) :
SubscriberUORB(unsigned interval) :
SubscriberNode(interval),
_uorb_sub(uorb_sub)
_uorb_sub(new uORB::SubscriptionBase(T::handle(), interval))
{}
virtual ~SubscriberUORB() {};
virtual ~SubscriberUORB() {
delete _uorb_sub;
};
/**
* Update Subscription
@@ -233,10 +235,9 @@ public:
* @param cbf Callback, executed on receiving a new message
* @param interval Minimal interval between calls to callback
*/
SubscriberUORBCallback(uORB::SubscriptionBase * uorb_sub,
unsigned interval,
SubscriberUORBCallback(unsigned interval,
std::function<void(const T &)> cbf) :
SubscriberUORB<T>(uorb_sub, interval),
SubscriberUORB<T>(interval),
_cbf(cbf)
{}