diff options
author | 2007-09-28 06:10:34 +0000 | |
---|---|---|
committer | 2007-09-28 06:10:34 +0000 | |
commit | 835e0c9f674554adf9621fd84b32c9cde9f2bdf6 (patch) | |
tree | 4cd4469110466b11a5c7809637279c092e706a3b /src/internal/Matrix.h | |
parent | 28c44a95c21bb18ec265faba69e750c430045f9c (diff) |
Found a way to have eval() be a member function of class EiObject, instead of a global function.
CCMAIL:bensch128@yahoo.com
Diffstat (limited to 'src/internal/Matrix.h')
-rw-r--r-- | src/internal/Matrix.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/internal/Matrix.h b/src/internal/Matrix.h index d56ac455a..738cc9f6b 100644 --- a/src/internal/Matrix.h +++ b/src/internal/Matrix.h @@ -97,13 +97,6 @@ class EiMatrix : public EiObject<_Scalar, EiMatrix<_Scalar, _Rows, _Cols> >, ~EiMatrix() {} }; -template<typename Scalar, typename Derived> -EiMatrix<Scalar, Derived::RowsAtCompileTime, Derived::ColsAtCompileTime> -eval(const EiObject<Scalar, Derived>& expression) -{ - return EiMatrix<Scalar, Derived::RowsAtCompileTime, Derived::ColsAtCompileTime>(expression); -} - #define EI_MAKE_TYPEDEFS(Type, TypeSuffix, Size, SizeSuffix) \ typedef EiMatrix<Type, Size, Size> EiMatrix##SizeSuffix##TypeSuffix; \ typedef EiMatrix<Type, Size, 1> EiVector##SizeSuffix##TypeSuffix; @@ -124,6 +117,7 @@ EI_MAKE_TYPEDEFS_ALL_SIZES(std::complex<double>, cd) #undef EI_MAKE_TYPEDEFS_ALL_SIZES #undef EI_MAKE_TYPEDEFS +#include "Eval.h" #include "MatrixOps.h" #include "ScalarOps.h" #include "RowAndCol.h" |