move pcl_macros include higher to avoid clash with VTK's X11 header i…

…nclusion
PointCloudLibrary · Feb 17, 2020 · 660a2c4 · 660a2c4
1 parent 643d81a
commit 660a2c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/common/include/pcl/pcl_macros.h b/common/include/pcl/pcl_macros.h
@@ -68,11 +68,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 
-//Eigen has an enum that clashes with X11 Success define, which is ultimately included by pcl
-#ifdef Success
-  #undef Success
-#endif
-#include <Eigen/Core>
+#include <Eigen/Core>  // for EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 
 #include <pcl/pcl_config.h>
 

diff --git a/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h b/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h
@@ -26,13 +26,14 @@
 
 #pragma once
 
+#include <pcl/pcl_macros.h>
+
 #include <vector>
 
 #include "vtkObject.h"
 #include "vtkWeakPointer.h"
 
 #include "vtkgl.h" // Needed for gl data types exposed in API
-#include <pcl/pcl_macros.h>
 
 class vtkCellArray;
 class vtkDataArray;