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