Skip to content

Commit

Permalink
Undef more emit symboles for tbb includes
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
  • Loading branch information
scpeters committed Feb 15, 2022
1 parent a99a224 commit 6b0d230
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions gazebo/transport/Connection.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
#ifndef _CONNECTION_HH_
#define _CONNECTION_HH_

#undef emit
#include <tbb/task.h>
#define emit

// If TBB_VERSION_MAJOR is not defined, this means that
// tbb >= 2021 and we can include the tbb/version.h header
Expand Down
2 changes: 2 additions & 0 deletions gazebo/transport/Node.hh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
#ifndef GAZEBO_TRANSPORT_NODE_HH_
#define GAZEBO_TRANSPORT_NODE_HH_

#undef emit
#include <tbb/task.h>
#define emit
#ifndef TBB_VERSION_MAJOR
#include <tbb/version.h>
#endif
Expand Down

0 comments on commit 6b0d230

Please sign in to comment.