From 69fa405096f16899ce625eb690440a473a7864bf Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 16 Feb 2015 17:21:16 +0100 Subject: Update circulant custom expression example --- doc/examples/TutorialLinAlgInverseDeterminant.cpp | 2 +- doc/examples/make_circulant.cpp.evaluator | 1 - doc/examples/make_circulant.cpp.expression | 2 +- doc/examples/make_circulant.cpp.traits | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/examples/TutorialLinAlgInverseDeterminant.cpp b/doc/examples/TutorialLinAlgInverseDeterminant.cpp index 43970ff05..14dde5b35 100644 --- a/doc/examples/TutorialLinAlgInverseDeterminant.cpp +++ b/doc/examples/TutorialLinAlgInverseDeterminant.cpp @@ -13,4 +13,4 @@ int main() cout << "Here is the matrix A:\n" << A << endl; cout << "The determinant of A is " << A.determinant() << endl; cout << "The inverse of A is:\n" << A.inverse() << endl; -} \ No newline at end of file +} diff --git a/doc/examples/make_circulant.cpp.evaluator b/doc/examples/make_circulant.cpp.evaluator index 98713cdc0..71c8d4027 100644 --- a/doc/examples/make_circulant.cpp.evaluator +++ b/doc/examples/make_circulant.cpp.evaluator @@ -8,7 +8,6 @@ namespace Eigen { typedef typename nested_eval::type ArgTypeNested; typedef typename remove_all::type ArgTypeNestedCleaned; typedef typename XprType::CoeffReturnType CoeffReturnType; - typedef typename XprType::Index Index; enum { CoeffReadCost = evaluator::CoeffReadCost, diff --git a/doc/examples/make_circulant.cpp.expression b/doc/examples/make_circulant.cpp.expression index a68bcb730..380cd4450 100644 --- a/doc/examples/make_circulant.cpp.expression +++ b/doc/examples/make_circulant.cpp.expression @@ -11,7 +11,7 @@ public: typedef typename Eigen::internal::ref_selector::type Nested; - typedef typename Eigen::internal::traits::Index Index; + typedef Eigen::Index Index; Index rows() const { return m_arg.rows(); } Index cols() const { return m_arg.rows(); } diff --git a/doc/examples/make_circulant.cpp.traits b/doc/examples/make_circulant.cpp.traits index f91e43717..4e04535d3 100644 --- a/doc/examples/make_circulant.cpp.traits +++ b/doc/examples/make_circulant.cpp.traits @@ -1,11 +1,11 @@ namespace Eigen { namespace internal { template - struct traits > + struct traits > { typedef Eigen::Dense StorageKind; typedef Eigen::MatrixXpr XprKind; - typedef typename ArgType::Index Index; + typedef typename ArgType::StorageIndex StorageIndex; typedef typename ArgType::Scalar Scalar; enum { Flags = Eigen::ColMajor, -- cgit v1.2.3