[gazebo] 05/06: Add Q_MOC_RUN to work around syntax error

[Jochen Sprickerhof]

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 92c054f14b261048d5ac3adca26588bbf16e97eb
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Nov 24 23:52:10 2017 +0100

    Add Q_MOC_RUN to work around syntax error
    
    
    Gbp-Pq: Name 0005-Add-Q_MOC_RUN-to-work-around-syntax-error.patch
---
 gazebo/common/SystemPaths.hh | 2 ++
 gazebo/math/Helpers.hh       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/gazebo/common/SystemPaths.hh b/gazebo/common/SystemPaths.hh
index 2196b0b..5cf805f 100644
--- a/gazebo/common/SystemPaths.hh
+++ b/gazebo/common/SystemPaths.hh
@@ -28,7 +28,9 @@
   #define GetCurrentDir getcwd
 #endif
 
+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include <boost/filesystem.hpp>
+#endif
 #include <list>
 #include <string>
 
diff --git a/gazebo/math/Helpers.hh b/gazebo/math/Helpers.hh
index 9e8e092..e9fdb59 100644
--- a/gazebo/math/Helpers.hh
+++ b/gazebo/math/Helpers.hh
@@ -17,8 +17,10 @@
 #ifndef _GAZEBO_MATH_FUNCTIONS_HH_
 #define _GAZEBO_MATH_FUNCTIONS_HH_
 
+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/math/special_functions/round.hpp>
+#endif
 #include <algorithm>
 #include <cmath>
 #include <limits>

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