From 9a47677ed2cda327f803bd491838e712c74413b1 Mon Sep 17 00:00:00 2001
From: cnr-isti-vclab <paolo.cignoni@isti.cnr.it>
Date: Thu, 22 Jan 2009 23:10:24 +0000
Subject: [PATCH] compilation fixes with eigen

---
 vcg/math/eigen.h                   | 4 ++--
 vcg/math/eigen_matrixbase_addons.h | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vcg/math/eigen.h b/vcg/math/eigen.h
index 769d876b..1565a43a 100644
--- a/vcg/math/eigen.h
+++ b/vcg/math/eigen.h
@@ -25,7 +25,7 @@
 #define EIGEN_VCGLIB
 
 // TODO enable the vectorization
-#define EIGEN_DONT_VECTORIZE
+//#define EIGEN_DONT_VECTORIZE
 #define EIGEN_MATRIXBASE_PLUGIN <vcg/math/eigen_matrixbase_addons.h>
 #define EIGEN_MATRIX_PLUGIN <vcg/math/eigen_matrix_addons.h>
 
@@ -33,7 +33,7 @@
 namespace Eigen {
 
 template<typename T> struct ei_traits;
-#include "../Eigen/src/Core/util/Meta.h"
+template<typename A,typename B> struct ei_is_same_type;
 
 template<typename Derived1, typename Derived2, int Size> struct ei_lexi_comparison;
 
diff --git a/vcg/math/eigen_matrixbase_addons.h b/vcg/math/eigen_matrixbase_addons.h
index e6341cb0..7ea9d023 100644
--- a/vcg/math/eigen_matrixbase_addons.h
+++ b/vcg/math/eigen_matrixbase_addons.h
@@ -197,7 +197,7 @@ EIGEN_DEPRECATED inline Scalar SquaredNorm() const { return squaredNorm(); };
 /** \deprecated use normalize() or normalized() */
 EIGEN_DEPRECATED inline Derived& Normalize() { normalize(); return derived(); };
 /** \deprecated use normalized() */
-EIGEN_DEPRECATED inline const EvalType Normalize() const { return normalized(); };
+EIGEN_DEPRECATED inline const PlainMatrixType Normalize() const { return normalized(); };
 
 /** \deprecated use transposeInPlace() or transpose() */
 EIGEN_DEPRECATED inline Derived& Transpose() { transposeInPlace(); return derived(); };
@@ -205,7 +205,7 @@ EIGEN_DEPRECATED inline Derived& Transpose() { transposeInPlace(); return derive
 EIGEN_DEPRECATED inline const Eigen::Transpose<Derived> Transpose() const { return transpose(); };
 
 /** \deprecated use .cross(p) */
-EIGEN_DEPRECATED inline EvalType operator ^ (const Derived& p ) const { return this->cross(p); }
+EIGEN_DEPRECATED inline PlainMatrixType operator ^ (const Derived& p ) const { return this->cross(p); }
 
 /// Homogeneous normalization (division by W)
 inline Derived& HomoNormalize()
@@ -226,9 +226,9 @@ inline Derived& HomoNormalize()
 	return *this;
 }
 
-inline const EvalType HomoNormalize() const
+inline const PlainMatrixType HomoNormalize() const
 {
-	EvalType res = derived();
+	PlainMatrixType res = derived();
 	return res.HomoNormalize();
 }