Merge remote-tracking branch 'origin/master'

SimoxUtility/SimoxUtility.h

@@ -2,8 +2,6 @@
 
 //dummy header
 
-#include "EigenStdVector.h"
-
 #include "math.h"
 #include "meta.h"
 #include "shapes.h"

SimoxUtility/eigen.h

@@ -3,4 +3,3 @@
 // This file is generated!
 
 #include "eigen/AssertAsException.h"
-#include "eigen/EigenStdVector.h"

SimoxUtility/eigen/EigenStdVector.h

 #pragma once
 
-#include<Eigen/StdVector>
-#ifndef EIGEN_STL_VECTOR_SPECIFICATION_DEFINED
-#define EIGEN_STL_VECTOR_SPECIFICATION_DEFINED
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector2f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector3f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector4f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::VectorXf)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::VectorXd)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Matrix2f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Matrix3f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Matrix4f)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::MatrixXf)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::MatrixXd)
+#include <Eigen/Core>
 
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector3d)
-EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector3i)
-#endif
+#include <vector>
+#include <memory>
+#include <deque>
+#include <queue>
 
+#pragma message("This header is deprecated. It contains fixes for C++ prior to C++11. See https://eigen.tuxfamily.org/dox/group__TopicStlContainers.html. Remove this header and check if e.g. <Eigen/Core> and <vector> should be used instead.")

VirtualRobot/VirtualRobot.h

@@ -105,11 +105,12 @@
 #endif
 
 
-// allow std vector to be used with Eigen objects
-
-#include <SimoxUtility/EigenStdVector.h>
-
 #include <memory>
+#include <vector>
+#include <deque>
+#include <queue>
+
+#include <Eigen/Core>
 
 
 namespace VirtualRobot
@@ -276,4 +277,3 @@ This assert macro does nothing on RELEASE builds.
 #define VR_ASSERT_MESSAGE(expr, msg) assert((expr)&&(msg))
 
 #endif
-

VirtualRobot/math/Grid3D.cpp

@@ -19,7 +19,6 @@
  *             GNU Lesser General Public License
  */
 
-#include <SimoxUtility/eigen/EigenStdVector.h>
 #include "Grid3D.h"
 #include "cmath"
 #include "Helpers.h"

VirtualRobot/math/Helpers.cpp

@@ -19,7 +19,6 @@
  *             GNU Lesser General Public License
  */
 
-#include <SimoxUtility/eigen/EigenStdVector.h>
 #include "Helpers.h"
 #include "LinearInterpolatedOrientation.h"