diff options
| author | James Goppert <james.goppert@gmail.com> | 2014-03-16 17:01:03 -0400 |
|---|---|---|
| committer | James Goppert <james.goppert@gmail.com> | 2014-03-20 12:12:42 -0400 |
| commit | afb2c37bfc20150718114c4ef56e40a7c4d4722f (patch) | |
| tree | 593fdec377ee6f0a6364a2a62783e868e59ba821 /src/modules/uORB/Subscription.hpp | |
| parent | da9dab27998fa9e8b7a66d53a00aa3cae93573ec (diff) | |
| download | px4-firmware-afb2c37bfc20150718114c4ef56e40a7c4d4722f.tar.gz px4-firmware-afb2c37bfc20150718114c4ef56e40a7c4d4722f.tar.bz2 px4-firmware-afb2c37bfc20150718114c4ef56e40a7c4d4722f.zip | |
Fixed uORB Pub/Sub templates for GCC 4.7
Diffstat (limited to 'src/modules/uORB/Subscription.hpp')
| -rw-r--r-- | src/modules/uORB/Subscription.hpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/modules/uORB/Subscription.hpp b/src/modules/uORB/Subscription.hpp index d839f8023..34e9a83e0 100644 --- a/src/modules/uORB/Subscription.hpp +++ b/src/modules/uORB/Subscription.hpp @@ -108,17 +108,11 @@ public: */ Subscription( List<SubscriptionBase *> * list, - const struct orb_metadata *meta, unsigned interval) : - T(), // initialize data structure to zero - SubscriptionBase(list, meta) { - setHandle(orb_subscribe(getMeta())); - orb_set_interval(getHandle(), interval); - } - + const struct orb_metadata *meta, unsigned interval); /** * Deconstructor */ - virtual ~Subscription() {} + virtual ~Subscription(); /* * XXX @@ -127,8 +121,8 @@ public: * should use dynamic cast, but doesn't * seem to be available */ - void *getDataVoidPtr() { return (void *)(T *)(this); } - T getData() { return T(*this); } + void *getDataVoidPtr(); + T getData(); }; } // namespace uORB |