diff options
| author |  Jitse Niesen <jitse@maths.leeds.ac.uk> | 2013-07-21 20:50:15 +0100 |
|---|---|---|
| committer | Jitse Niesen <jitse@maths.leeds.ac.uk> | 2013-07-21 20:50:15 +0100 |
| commit | 5879937f58efb9337b82d288ae8dd3513b918791 (patch) | |
| tree | 806bff387d4d02deb72c177daddf5d17e3473b4b /Eigen/src/Core/MatrixBase.h | |
| parent | 660b905e129c92fd0e8271d2df06d11347f4f32f (diff) | |
| parent | 01190b3544cd0a674be6475185d5dd8e4b7890c5 (diff) | |
Merge in jdh8's branch.
* Enable singular matrix power and complex exponents.
* Eliminate unnecessary copying for sparse Kronecker product.
Diffstat (limited to 'Eigen/src/Core/MatrixBase.h')
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 9193b6abb..fbed47233 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -162,9 +162,6 @@ template<typename Derived> class MatrixBase #ifndef EIGEN_PARSED_BY_DOXYGEN template<typename ProductDerived, typename Lhs, typename Rhs> Derived& lazyAssign(const ProductBase<ProductDerived, Lhs,Rhs>& other); - - template<typename MatrixPower, typename Lhs, typename Rhs> - Derived& lazyAssign(const MatrixPowerProduct<MatrixPower, Lhs,Rhs>& other); #endif // not EIGEN_PARSED_BY_DOXYGEN template<typename OtherDerived> @@ -458,6 +455,7 @@ template<typename Derived> class MatrixBase const MatrixSquareRootReturnValue<Derived> sqrt() const; const MatrixLogarithmReturnValue<Derived> log() const; const MatrixPowerReturnValue<Derived> pow(const RealScalar& p) const; + const MatrixComplexPowerReturnValue<Derived> pow(const std::complex<RealScalar>& p) const; #ifdef EIGEN2_SUPPORT template<typename ProductDerived, typename Lhs, typename Rhs> |