Fix BOOST_JOIN moc error with Qt 4 and Boost 1.58 (#1149)

ros-visualization · Apr 26, 2018 · 8a5201e · 8a5201e
1 parent a54d547
commit 8a5201e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/rviz/robot/robot.h b/src/rviz/robot/robot.h
@@ -39,7 +39,9 @@
 #include <OgreQuaternion.h>
 #include <OgreAny.h>
 
+#ifndef Q_MOC_RUN
 #include <urdf/model.h> // can be replaced later by urdf_model/types.h
+#endif
 
 namespace Ogre
 {

diff --git a/src/rviz/robot/robot_joint.h b/src/rviz/robot/robot_joint.h
@@ -40,10 +40,10 @@
 #include <OgreQuaternion.h>
 #include <OgreAny.h>
 #include <OgreMaterial.h>
-#endif
 
 #include <urdf/model.h>
 #include <urdf_model/pose.h>
+#endif
 
 #include "rviz/ogre_helpers/object.h"
 #include "rviz/selection/forwards.h"

diff --git a/src/rviz/robot/robot_link.h b/src/rviz/robot/robot_link.h
@@ -41,10 +41,10 @@
 #include <OgreAny.h>
 #include <OgreMaterial.h>
 #include <OgreSharedPtr.h>
-#endif
 
 #include <urdf/model.h> // can be replaced later by urdf_model/types.h
 #include <urdf_model/pose.h>
+#endif
 
 #include "rviz/ogre_helpers/object.h"
 #include "rviz/selection/forwards.h"