[gazebo] 06/06: gazebo-7.4.0-fixmoc

Jochen Sprickerhof jspricke at moszumanska.debian.org
Sat Dec 23 17:05:48 UTC 2017 

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to branch patch-queue/master
in repository gazebo.

commit 807cee8ae73b495d6a2648a45d40e39b29ae2224
Author: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Date:   Sat Dec 23 17:59:19 2017 +0100

    gazebo-7.4.0-fixmoc
    
    ===================================================================
    
    Gbp-Pq: Name gazebo-7.4.0-fixmoc.patch
---
 gazebo/common/CommonTypes.hh       | 2 ++
 gazebo/common/Event.hh             | 2 ++
 gazebo/gui/ApplyWrenchDialog.hh    | 2 ++
 gazebo/gui/DataLogger.cc           | 2 ++
 gazebo/msgs/MessageTypes.hh.in     | 2 ++
 gazebo/msgs/msgs.hh                | 2 ++
 gazebo/rendering/RenderTypes.hh    | 2 ++
 gazebo/rendering/Visual.hh         | 2 ++
 gazebo/transport/TransportTypes.hh | 2 ++
 plugins/CessnaGUIPlugin.hh         | 4 ++--
 plugins/KeyboardGUIPlugin.hh       | 2 +-
 plugins/TimerGUIPlugin.hh          | 4 ++--
 12 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/gazebo/common/CommonTypes.hh b/gazebo/common/CommonTypes.hh
index 9a61f92..28fa329 100644
--- a/gazebo/common/CommonTypes.hh
+++ b/gazebo/common/CommonTypes.hh
@@ -21,7 +21,9 @@
 #include <map>
 #include <string>
 #include <memory>
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include "gazebo/util/system.hh"
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/gazebo/common/Event.hh b/gazebo/common/Event.hh
index 49d7586..ed2a0ea 100644
--- a/gazebo/common/Event.hh
+++ b/gazebo/common/Event.hh
@@ -26,8 +26,10 @@
 #include <mutex>
 #include <list>
 
+#ifndef Q_MOC_RUN
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
+#endif
 
 #include <gazebo/gazebo_config.h>
 #include <gazebo/common/Time.hh>
diff --git a/gazebo/gui/ApplyWrenchDialog.hh b/gazebo/gui/ApplyWrenchDialog.hh
index 5164e89..2e4722f 100644
--- a/gazebo/gui/ApplyWrenchDialog.hh
+++ b/gazebo/gui/ApplyWrenchDialog.hh
@@ -20,10 +20,12 @@
 
 #include <string>
 
+#ifndef Q_MOC_RUN
 #include "gazebo/common/MouseEvent.hh"
 #include "gazebo/gui/qt.h"
 #include "gazebo/math/Vector3.hh"
 #include "gazebo/transport/TransportTypes.hh"
+#endif
 
 namespace gazebo
 {
diff --git a/gazebo/gui/DataLogger.cc b/gazebo/gui/DataLogger.cc
index bd15c53..527c483 100644
--- a/gazebo/gui/DataLogger.cc
+++ b/gazebo/gui/DataLogger.cc
@@ -23,6 +23,7 @@
   #include <io.h>
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/filesystem.hpp>
 #include <stdio.h>
 
@@ -32,6 +33,7 @@
 #include "gazebo/gui/DataLoggerPrivate.hh"
 #include "gazebo/msgs/msgs.hh"
 #include "gazebo/transport/transport.hh"
+#endif
 
 using namespace gazebo;
 using namespace gui;
diff --git a/gazebo/msgs/MessageTypes.hh.in b/gazebo/msgs/MessageTypes.hh.in
index 410e15a..b7721fd 100644
--- a/gazebo/msgs/MessageTypes.hh.in
+++ b/gazebo/msgs/MessageTypes.hh.in
@@ -4,4 +4,6 @@
 #ifdef __MACH__
 # undef TYPE_BOOL
 #endif
+#ifndef Q_MOC_RUN
 ${message_headers}
+#endif
diff --git a/gazebo/msgs/msgs.hh b/gazebo/msgs/msgs.hh
index aaa237b..94417f9 100644
--- a/gazebo/msgs/msgs.hh
+++ b/gazebo/msgs/msgs.hh
@@ -21,6 +21,7 @@
 
 #include <sdf/sdf.hh>
 
+#ifndef Q_MOC_RUN
 #include <ignition/math/Inertial.hh>
 #include <ignition/math/MassMatrix3.hh>
 #include <ignition/math/Plane.hh>
@@ -42,6 +43,7 @@
 #include "gazebo/common/Color.hh"
 #include "gazebo/common/Time.hh"
 #include "gazebo/common/Image.hh"
+#endif
 
 namespace gazebo
 {
diff --git a/gazebo/rendering/RenderTypes.hh b/gazebo/rendering/RenderTypes.hh
index b9eaad9..c7d806a 100644
--- a/gazebo/rendering/RenderTypes.hh
+++ b/gazebo/rendering/RenderTypes.hh
@@ -17,7 +17,9 @@
 #ifndef _RENDERTYPES_HH_
 #define _RENDERTYPES_HH_
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 #include "gazebo/gazebo_config.h"
 #include "gazebo/util/system.hh"
 
diff --git a/gazebo/rendering/Visual.hh b/gazebo/rendering/Visual.hh
index c6ecace..8d9f5af 100644
--- a/gazebo/rendering/Visual.hh
+++ b/gazebo/rendering/Visual.hh
@@ -18,8 +18,10 @@
 #ifndef _GAZEBO_VISUAL_HH_
 #define _GAZEBO_VISUAL_HH_
 
+#ifndef Q_MOC_RUN
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/function.hpp>
+#endif
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/gazebo/transport/TransportTypes.hh b/gazebo/transport/TransportTypes.hh
index 4ab36d9..ec208dc 100644
--- a/gazebo/transport/TransportTypes.hh
+++ b/gazebo/transport/TransportTypes.hh
@@ -17,7 +17,9 @@
 #ifndef _TRANSPORT_TYPES_HH_
 #define _TRANSPORT_TYPES_HH_
 
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif
 // avoid collision from Mac OS X's ConditionalMacros.h
 // see gazebo issue #1289
 #ifdef __MACH__
diff --git a/plugins/CessnaGUIPlugin.hh b/plugins/CessnaGUIPlugin.hh
index f41e3ae..953a12a 100644
--- a/plugins/CessnaGUIPlugin.hh
+++ b/plugins/CessnaGUIPlugin.hh
@@ -18,9 +18,9 @@
 #define _GAZEBO_GUI_CESSNA_PLUGIN_HH_
 
 #include <mutex>
-#include <gazebo/common/Plugin.hh>
-#include <gazebo/gui/GuiPlugin.hh>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+# include <gazebo/common/Plugin.hh>
+# include <gazebo/gui/GuiPlugin.hh>
 # include <gazebo/transport/transport.hh>
 # include <gazebo/gui/gui.hh>
 #endif
diff --git a/plugins/KeyboardGUIPlugin.hh b/plugins/KeyboardGUIPlugin.hh
index 82326f3..b2f518f 100644
--- a/plugins/KeyboardGUIPlugin.hh
+++ b/plugins/KeyboardGUIPlugin.hh
@@ -18,10 +18,10 @@
 #define GAZEBO_PLUGINS_KEYBOARDGUIPLUGIN_HH_
 
 #include <memory>
-#include <gazebo/common/Plugin.hh>
 
 // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #ifndef Q_MOC_RUN
+# include <gazebo/common/Plugin.hh>
 # include <gazebo/gui/gui.hh>
 #endif
 
diff --git a/plugins/TimerGUIPlugin.hh b/plugins/TimerGUIPlugin.hh
index c8e4890..a3f3d4e 100644
--- a/plugins/TimerGUIPlugin.hh
+++ b/plugins/TimerGUIPlugin.hh
@@ -22,10 +22,10 @@
 #include <boost/thread/mutex.hpp>
 
 #include <gazebo/common/Events.hh>
-#include <gazebo/common/Plugin.hh>
 #include <gazebo/common/Timer.hh>
-#include <gazebo/gui/GuiPlugin.hh>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+# include <gazebo/gui/GuiPlugin.hh>
+# include <gazebo/common/Plugin.hh>
 # include <gazebo/transport/transport.hh>
 # include <gazebo/gui/gui.hh>
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git

More information about the debian-science-commits mailing list