Merge pull request #1062 from fran6co/boost

Fix for boost 1.57
PointCloudLibrary · Jan 5, 2015 · eff3795 · eff3795
2 parents 137d9b4 + 1d48a75
commit eff3795
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
@@ -33,9 +33,9 @@
  *
  */
 
+#ifndef Q_MOC_RUN
 #pragma once
 #include <boost/thread/thread.hpp>
-#ifndef Q_MOC_RUN
 #include <boost/date_time/posix_time/posix_time.hpp>
 #endif
 

diff --git a/common/include/pcl/common/boost.h b/common/include/pcl/common/boost.h
@@ -43,20 +43,20 @@
 #pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 // Marking all Boost headers as system headers to remove warnings
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/mpl/size.hpp>
-#ifndef Q_MOC_RUN
 #include <boost/date_time/posix_time/posix_time.hpp>
-#endif
 #include <boost/function.hpp>
 //#include <boost/timer.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/signals2.hpp>
 #include <boost/signals2/slot.hpp>
 #include <boost/algorithm/string.hpp>
+#endif
 
 #endif    // PCL_COMMON_BOOST_H_
diff --git a/common/include/pcl/conversions.h b/common/include/pcl/conversions.h
@@ -52,7 +52,9 @@
 #include <pcl/for_each_type.h>
 #include <pcl/exceptions.h>
 #include <pcl/console/print.h>
+#ifndef Q_MOC_RUN
 #include <boost/foreach.hpp>
+#endif
 
 namespace pcl
 {

diff --git a/common/include/pcl/for_each_type.h b/common/include/pcl/for_each_type.h
@@ -44,6 +44,7 @@
 #pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 #include <boost/mpl/is_sequence.hpp>
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/next_prior.hpp>
@@ -54,6 +55,7 @@
 #include <boost/mpl/not.hpp>
 #include <boost/mpl/aux_/unwrap.hpp>
 #include <boost/type_traits/is_same.hpp>
+#endif
 
 namespace pcl 
 {

diff --git a/common/include/pcl/register_point_struct.h b/common/include/pcl/register_point_struct.h
@@ -51,6 +51,8 @@
   #pragma warning (disable: 4244)
 #endif
 
+//https://bugreports.qt-project.org/browse/QTBUG-22829
+#ifndef Q_MOC_RUN
 #include <pcl/pcl_macros.h>
 #include <pcl/point_traits.h>
 #include <boost/mpl/vector.hpp>
@@ -60,8 +62,6 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/comparison.hpp>
 #include <boost/utility.hpp>
-//https://bugreports.qt-project.org/browse/QTBUG-22829
-#ifndef Q_MOC_RUN
 #include <boost/type_traits.hpp>
 #endif
 #include <stddef.h> //offsetof

diff --git a/tools/boost.h b/tools/boost.h
@@ -45,19 +45,19 @@
 #pragma GCC system_header 
 #endif
 
+#ifndef Q_MOC_RUN
 // Marking all Boost headers as system headers to remove warnings
 #include <boost/random.hpp>
 #include <boost/random/normal_distribution.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/date_time/gregorian/gregorian_types.hpp>
-#ifndef Q_MOC_RUN
 #include <boost/date_time/posix_time/posix_time.hpp>
-#endif
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/thread/thread.hpp>
 //#include <boost/uuid/uuid.hpp>
 //#include <boost/uuid/uuid_generators.hpp>
+#endif
 
 #endif    // PCL_TOOLS_BOOST_H_
diff --git a/visualization/include/pcl/visualization/interactor_style.h b/visualization/include/pcl/visualization/interactor_style.h
@@ -47,8 +47,9 @@
 #include <pcl/visualization/mouse_event.h>
 #include <pcl/visualization/point_picking_event.h>
 #include <pcl/visualization/area_picking_event.h>
+#ifndef Q_MOC_RUN
 #include <boost/signals2/signal.hpp>
-
+#endif
 #include <vtkInteractorStyleRubberBandPick.h>
 
 class vtkRendererCollection;

diff --git a/visualization/tools/image_viewer.cpp b/visualization/tools/image_viewer.cpp
@@ -36,8 +36,8 @@
  *	
  */
 
-#include <boost/thread/thread.hpp>
 #ifndef Q_MOC_RUN
+#include <boost/thread/thread.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #endif
 #include <pcl/point_cloud.h>