From 830eb8528e03317ed5b113e3a1cc7583e9c11d28 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 5 Jan 2017 13:10:30 -0800 Subject: [PATCH] fixed merge conflict Signed-off-by: Mark Charlebois --- src/modules/uORB/uORBManager.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/modules/uORB/uORBManager.cpp b/src/modules/uORB/uORBManager.cpp index 4eb461cec3..0a5f4da176 100644 --- a/src/modules/uORB/uORBManager.cpp +++ b/src/modules/uORB/uORBManager.cpp @@ -143,11 +143,6 @@ int uORB::Manager::orb_exists(const struct orb_metadata *meta, int instance) #endif } -orb_advert_t uORB::Manager::orb_advertise(const struct orb_metadata *meta, const void *data, unsigned int queue_size) -{ - return orb_advertise_multi(meta, data, nullptr, ORB_PRIO_DEFAULT, queue_size); -} - orb_advert_t uORB::Manager::orb_advertise_multi(const struct orb_metadata *meta, const void *data, int *instance, int priority, unsigned int queue_size) {