aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/Geometry
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2011-01-24 11:21:58 -0500
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2011-01-24 11:21:58 -0500
commitbd12ac4ffcfa6c99c28e1fe1d93a2e182fa6e6c4 (patch)
tree54c93525f048aa4952112a4401f85d98ce86514d /Eigen/Geometry
parent5bfde30e48885d941b8d4bc7c10c0ed1d6025391 (diff)
import eigen2 Geometry module into Eigen2Support.
fix build of geometry tests
Diffstat (limited to 'Eigen/Geometry')
-rw-r--r--Eigen/Geometry37
1 files changed, 22 insertions, 15 deletions
diff --git a/Eigen/Geometry b/Eigen/Geometry
index 76e64aad0..35bd153f4 100644
--- a/Eigen/Geometry
+++ b/Eigen/Geometry
@@ -33,22 +33,29 @@ namespace Eigen {
*/
#include "src/Geometry/OrthoMethods.h"
-#include "src/Geometry/Homogeneous.h"
-#include "src/Geometry/RotationBase.h"
-#include "src/Geometry/Rotation2D.h"
-#include "src/Geometry/Quaternion.h"
-#include "src/Geometry/AngleAxis.h"
#include "src/Geometry/EulerAngles.h"
-#include "src/Geometry/Transform.h"
-#include "src/Geometry/Translation.h"
-#include "src/Geometry/Scaling.h"
-#include "src/Geometry/Hyperplane.h"
-#include "src/Geometry/ParametrizedLine.h"
-#include "src/Geometry/AlignedBox.h"
-#include "src/Geometry/Umeyama.h"
-
-#if defined EIGEN_VECTORIZE_SSE
- #include "src/Geometry/arch/Geometry_SSE.h"
+
+#if EIGEN2_SUPPORT_STAGE > STAGE20_RESOLVE_API_CONFLICTS
+ #include "src/Geometry/Homogeneous.h"
+ #include "src/Geometry/RotationBase.h"
+ #include "src/Geometry/Rotation2D.h"
+ #include "src/Geometry/Quaternion.h"
+ #include "src/Geometry/AngleAxis.h"
+ #include "src/Geometry/Transform.h"
+ #include "src/Geometry/Translation.h"
+ #include "src/Geometry/Scaling.h"
+ #include "src/Geometry/Hyperplane.h"
+ #include "src/Geometry/ParametrizedLine.h"
+ #include "src/Geometry/AlignedBox.h"
+ #include "src/Geometry/Umeyama.h"
+
+ #if defined EIGEN_VECTORIZE_SSE
+ #include "src/Geometry/arch/Geometry_SSE.h"
+ #endif
+#endif
+
+#ifdef EIGEN2_SUPPORT
+#include "src/Eigen2Support/Geometry/All.h"
#endif
} // namespace Eigen