Skip to content

Fix macOS build: disable thread-safety annotations in LockedPriorityQ… #2233

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

Open
wants to merge 1 commit into
base: kilted
Choose a base branch
from
Open

Fix macOS build: disable thread-safety annotations in LockedPriorityQ… #2233

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
6 changes: 6 additions & 0 deletions rosbag2_transport/src/rosbag2_transport/locked_priority_queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
#include "rcpputils/thread_safety_annotations.hpp"
#include "rcpputils/unique_lock.hpp"

#ifdef __APPLE__
// On macOS, thread-safety annotations break compilation; make them no-op
#undef RCPPUTILS_TSA_GUARDED_BY
#define RCPPUTILS_TSA_GUARDED_BY(x)
#endif

/// \brief `std::priority_queue` wrapper with locks and stable sorting.
/// \details This class wraps a `std::priority_queue` and provides locking for thread-safe
/// access. It uses std::vector as underlying container for the `std::priority_queue` and
Expand Down