Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Fast-RTPS 1.9.0 #302

Merged
merged 1 commit into from
Aug 7, 2019
Merged

Support Fast-RTPS 1.9.0 #302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_subscriber_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ class SubListener : public EventListenerInterface, public eprosima::fastrtps::Su
{
// Make sure to call into Fast-RTPS before taking the lock to avoid an
// ABBA deadlock between internalMutex_ and mutexes inside of Fast-RTPS.
#if FASTRTPS_VERSION_MAJOR == 1 && FASTRTPS_VERSION_MINOR < 9
uint64_t unread_count = sub->getUnreadCount();
#else
uint64_t unread_count = sub->get_unread_count();
#endif

std::lock_guard<std::mutex> lock(internalMutex_);

Expand Down Expand Up @@ -140,7 +144,11 @@ class SubListener : public EventListenerInterface, public eprosima::fastrtps::Su
{
// Make sure to call into Fast-RTPS before taking the lock to avoid an
// ABBA deadlock between internalMutex_ and mutexes inside of Fast-RTPS.
#if FASTRTPS_VERSION_MAJOR == 1 && FASTRTPS_VERSION_MINOR < 9
uint64_t unread_count = sub->getUnreadCount();
#else
uint64_t unread_count = sub->get_unread_count();
#endif

std::lock_guard<std::mutex> lock(internalMutex_);
ConditionalScopedLock clock(conditionMutex_);
Expand Down