From 6b0d2301c7a37b5c24a206e5256cf7ccd2bd2662 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 14 Feb 2022 22:00:54 -0800 Subject: [PATCH] Undef more emit symboles for tbb includes Signed-off-by: Steve Peters --- gazebo/transport/Connection.hh | 2 ++ gazebo/transport/Node.hh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gazebo/transport/Connection.hh b/gazebo/transport/Connection.hh index c7aa54b97c..af3fee50b0 100644 --- a/gazebo/transport/Connection.hh +++ b/gazebo/transport/Connection.hh @@ -17,7 +17,9 @@ #ifndef _CONNECTION_HH_ #define _CONNECTION_HH_ +#undef emit #include +#define emit // If TBB_VERSION_MAJOR is not defined, this means that // tbb >= 2021 and we can include the tbb/version.h header diff --git a/gazebo/transport/Node.hh b/gazebo/transport/Node.hh index 45c4eda285..91ccbd692f 100644 --- a/gazebo/transport/Node.hh +++ b/gazebo/transport/Node.hh @@ -18,7 +18,9 @@ #ifndef GAZEBO_TRANSPORT_NODE_HH_ #define GAZEBO_TRANSPORT_NODE_HH_ +#undef emit #include +#define emit #ifndef TBB_VERSION_MAJOR #include #endif