Blob Blame History Raw
diff -up ./gazebo/physics/ode/ODEPhysics.hh.tbb ./gazebo/physics/ode/ODEPhysics.hh
--- ./gazebo/physics/ode/ODEPhysics.hh.tbb	2019-03-28 20:58:33.000000000 -0400
+++ ./gazebo/physics/ode/ODEPhysics.hh	2020-04-19 14:00:41.142749690 -0400
@@ -17,8 +17,10 @@
 #ifndef _ODEPHYSICS_HH_
 #define _ODEPHYSICS_HH_
 
+#ifndef Q_MOC_RUN
 #include <tbb/spin_mutex.h>
 #include <tbb/concurrent_vector.h>
+#endif
 #include <string>
 #include <utility>
 
diff -up ./gazebo/physics/physics_pch.hh.tbb ./gazebo/physics/physics_pch.hh
--- ./gazebo/physics/physics_pch.hh.tbb	2019-03-28 20:58:33.000000000 -0400
+++ ./gazebo/physics/physics_pch.hh	2020-04-19 14:00:41.142749690 -0400
@@ -53,10 +53,12 @@
 #include <sstream>
 #include <string>
 #include <string.h>
+#ifndef Q_MOC_RUN
 #include <tbb/blocked_range.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/parallel_for.h>
 #include <tbb/spin_mutex.h>
+#endif
 #include <time.h>
 #include <utility>
 #include <vector>
diff -up ./gazebo/transport/Connection.hh.tbb ./gazebo/transport/Connection.hh
--- ./gazebo/transport/Connection.hh.tbb	2019-03-28 20:58:33.000000000 -0400
+++ ./gazebo/transport/Connection.hh	2020-04-19 14:00:41.143749697 -0400
@@ -17,7 +17,9 @@
 #ifndef _CONNECTION_HH_
 #define _CONNECTION_HH_
 
+#ifndef Q_MOC_RUN
 #include <tbb/task.h>
+#endif
 #include <google/protobuf/message.h>
 
 #include <boost/asio.hpp>
diff -up ./gazebo/transport/Node.hh.tbb ./gazebo/transport/Node.hh
--- ./gazebo/transport/Node.hh.tbb	2019-03-28 20:58:33.000000000 -0400
+++ ./gazebo/transport/Node.hh	2020-04-19 14:00:41.143749697 -0400
@@ -18,7 +18,9 @@
 #ifndef GAZEBO_TRANSPORT_NODE_HH_
 #define GAZEBO_TRANSPORT_NODE_HH_
 
+#ifndef Q_MOC_RUN
 #include <tbb/task.h>
+#endif
 #include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <map>
diff -up ./gazebo/transport/transport_pch.hh.tbb ./gazebo/transport/transport_pch.hh
--- ./gazebo/transport/transport_pch.hh.tbb	2019-03-28 20:58:33.000000000 -0400
+++ ./gazebo/transport/transport_pch.hh	2020-04-19 14:00:41.143749697 -0400
@@ -44,8 +44,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
+#ifndef Q_MOC_RUN
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/task.h>
+#endif
 #include <utility>
 #include <vector>