Skip to content

Commit

Permalink
void LCM::unsubscribe() -> int LCM::unsubscribe()
Browse files Browse the repository at this point in the history
  • Loading branch information
ashuang committed Oct 28, 2015
1 parent d45be01 commit 808fb2f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
9 changes: 5 additions & 4 deletions lcm/lcm-cpp-impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,24 @@ LCM::publish(const std::string& channel, const MessageType *msg) {
return status;
}

inline void
inline int
LCM::unsubscribe(Subscription *subscription) {
if(!this->lcm) {
fprintf(stderr,
"LCM instance not initialized. Ignoring call to unsubscribe()\n");
return;
return -1;
}
std::vector<Subscription*>::iterator iter;
std::vector<Subscription*>::iterator eiter = subscriptions.end();
for(iter=subscriptions.begin(); iter!= eiter; ++iter) {
if(*iter == subscription) {
lcm_unsubscribe(lcm, subscription->c_subs);
int status = lcm_unsubscribe(lcm, subscription->c_subs);
subscriptions.erase(iter);
delete subscription;
break;
return status;
}
}
return -1;
}

inline int
Expand Down
5 changes: 4 additions & 1 deletion lcm/lcm-cpp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,11 @@ class LCM {
*
* @param subscription a Subscription object previously returned by a
* call to subscribe() or subscribeFunction().
*
* @return 0 on success, -1 if @p subscription is not a valid
* subscription.
*/
inline void unsubscribe(Subscription* subscription);
inline int unsubscribe(Subscription* subscription);

/**
* @brief retrives the lcm_t C data structure wrapped by this class.
Expand Down

0 comments on commit 808fb2f

Please sign in to comment.