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

C++: Improve error message when finding X11 macro Unsorted #7855

Merged
merged 2 commits into from
Oct 22, 2024
+8 −0
Merged

C++: Improve error message when finding X11 macro Unsorted #7855

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79208e3
Fix conflicts with X11 headers by adding `#undef Unsorted`
emilk Oct 21, 2024
7cb4c5f
Replace with #error
emilk Oct 22, 2024
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 rerun_cpp/src/rerun/time_column.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
#include "error.hpp"
#include "timeline.hpp"

// X.h (of X11) has a macro called `Unsorted`
// See <https://codebrowser.dev/kde/include/X11/X.h.html#_M/Unsorted>
// and <https://github.com/rerun-io/rerun/issues/7846>.
#ifdef Unsorted
#error \
"Found a macro 'Unsorted' (probably from X11), conflicting with `rerun::SortingStatus::Unsorted`. Add '#undef Unsorted' before '#include <rerun.hpp>' to work around this."
#endif

struct rr_time_column;

namespace arrow {
Expand Down
Loading