aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB/Publication.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-11-25 15:58:27 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-11-25 15:58:27 +0100
commit3c6f6618e8709c22ac21f8f0353f292f25da22f7 (patch)
treee472fd1aad3d301213305b1c349b2c507a0c9489 /src/modules/uORB/Publication.cpp
parent55cf2fc61c7b90725cd960f9c7d72737024f1cfc (diff)
parent579ec36c28d4cbf08d93531853b2b8fd3f3461ac (diff)
downloadpx4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.tar.gz
px4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.tar.bz2
px4-firmware-3c6f6618e8709c22ac21f8f0353f292f25da22f7.zip
Merge remote-tracking branch 'upstream/uorbtinymerge' into dev_ros
Diffstat (limited to 'src/modules/uORB/Publication.cpp')
-rw-r--r--src/modules/uORB/Publication.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/uORB/Publication.cpp b/src/modules/uORB/Publication.cpp
index 302b99c69..12ef83aa0 100644
--- a/src/modules/uORB/Publication.cpp
+++ b/src/modules/uORB/Publication.cpp
@@ -53,10 +53,10 @@ namespace uORB {
template<class T>
Publication<T>::Publication(
- List<PublicationBase *> * list,
- const struct orb_metadata *meta) :
+ const struct orb_metadata *meta,
+ List<PublicationNode *> * list) :
T(), // initialize data structure to zero
- PublicationBase(list, meta) {
+ PublicationNode(meta, list) {
}
template<class T>