From 0d44c0906bedf9c3b66b38e9fc1d42a6d24f25cb Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Thu, 11 Oct 2007 20:32:12 +0000 Subject: [PATCH] simplify the new USING_EIGEN_DATA_TYPES macro --- src/Core/Matrix.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Core/Matrix.h b/src/Core/Matrix.h index a87de43ac..3f57e2191 100644 --- a/src/Core/Matrix.h +++ b/src/Core/Matrix.h @@ -123,24 +123,24 @@ EI_MAKE_TYPEDEFS_ALL_SIZES(std::complex, cd) #undef EI_MAKE_TYPEDEFS_ALL_SIZES #undef EI_MAKE_TYPEDEFS -#define EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(Type, TypeSuffix, Size, SizeSuffix) \ +#define EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, SizeSuffix) \ using Eigen::Matrix##SizeSuffix##TypeSuffix; \ using Eigen::Vector##SizeSuffix##TypeSuffix; \ using Eigen::RowVector##SizeSuffix##TypeSuffix; -#define EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(Type, TypeSuffix) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(Type, TypeSuffix, 2, 2) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(Type, TypeSuffix, 3, 3) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(Type, TypeSuffix, 4, 4) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(Type, TypeSuffix, Dynamic, X) +#define EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(TypeSuffix) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 2) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 3) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 4) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, X) #define EI_USING_MATRIX_TYPEDEFS \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(int, i) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(float, f) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(double, d) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(std::complex, ci) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(std::complex, cf) \ -EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(std::complex, cd) +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(i) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(f) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(d) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(ci) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(cf) \ +EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(cd) #include "Eval.h" #include "MatrixOps.h"