diff options
| author | Stefan Rado <px4@sradonia.net> | 2014-03-22 11:13:54 +0100 |
|---|---|---|
| committer | Stefan Rado <px4@sradonia.net> | 2014-03-22 11:13:54 +0100 |
| commit | 1a98589f3a5f38dcbe65213e9c914e594241532a (patch) | |
| tree | eaedb8d8257b8469dc65c4354bafbd2b73826a6d /src/modules/controllib/block/Block.cpp | |
| parent | ec78fcf2b9e75c6ca9ab6cd0772ee2b7beef4300 (diff) | |
| parent | a1fad76f2b40aaa41817510e1a6748b111041f8f (diff) | |
| download | px4-firmware-1a98589f3a5f38dcbe65213e9c914e594241532a.tar.gz px4-firmware-1a98589f3a5f38dcbe65213e9c914e594241532a.tar.bz2 px4-firmware-1a98589f3a5f38dcbe65213e9c914e594241532a.zip | |
Merge remote-tracking branch 'remotes/origin/master' into param_tool
Diffstat (limited to 'src/modules/controllib/block/Block.cpp')
| -rw-r--r-- | src/modules/controllib/block/Block.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/controllib/block/Block.cpp b/src/modules/controllib/block/Block.cpp index b964d40a3..6768bfa7e 100644 --- a/src/modules/controllib/block/Block.cpp +++ b/src/modules/controllib/block/Block.cpp @@ -41,10 +41,11 @@ #include <string.h> #include <stdio.h> +#include <uORB/Subscription.hpp> +#include <uORB/Publication.hpp> + #include "Block.hpp" #include "BlockParam.hpp" -#include "../uorb/UOrbSubscription.hpp" -#include "../uorb/UOrbPublication.hpp" namespace control { @@ -100,7 +101,7 @@ void Block::updateParams() void Block::updateSubscriptions() { - UOrbSubscriptionBase *sub = getSubscriptions().getHead(); + uORB::SubscriptionBase *sub = getSubscriptions().getHead(); int count = 0; while (sub != NULL) { @@ -118,7 +119,7 @@ void Block::updateSubscriptions() void Block::updatePublications() { - UOrbPublicationBase *pub = getPublications().getHead(); + uORB::PublicationBase *pub = getPublications().getHead(); int count = 0; while (pub != NULL) { |