From 9cd4f67e7f84662ac31f4a6b3f85a3b96f742053 Mon Sep 17 00:00:00 2001 From: Jitse Niesen Date: Sun, 12 Dec 2010 11:44:30 +0000 Subject: [PATCH 1/2] Specify root namespace for fftw_plan from FFTW3 library. After changeset 4716040703be1ee906439385d20475dcddad5ce3 (the ei_ --> internal:: change), there are two symbols called fftw_plan, one from the FFTW3 library and one from Eigen. --- unsupported/Eigen/src/FFT/ei_fftw_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unsupported/Eigen/src/FFT/ei_fftw_impl.h b/unsupported/Eigen/src/FFT/ei_fftw_impl.h index 84e4fcda5..a06f6739e 100644 --- a/unsupported/Eigen/src/FFT/ei_fftw_impl.h +++ b/unsupported/Eigen/src/FFT/ei_fftw_impl.h @@ -108,7 +108,7 @@ namespace internal { { typedef double scalar_type; typedef fftw_complex complex_type; - fftw_plan m_plan; + ::fftw_plan m_plan; fftw_plan() :m_plan(NULL) {} ~fftw_plan() {if (m_plan) fftw_destroy_plan(m_plan);} From 4a5ebcd1ce4c6e2a97a540b612f7ae5a94a0a970 Mon Sep 17 00:00:00 2001 From: Jitse Niesen Date: Sun, 12 Dec 2010 13:53:42 +0000 Subject: [PATCH 2/2] Fix compilation of Tridiagonalization_diagonal example. After changeset 0d6321225786bc3d95f1dbe5236f07c5e5e96179 , matrixT() is a real matrix even if the matrix which is decomposed is complex. --- doc/snippets/Tridiagonalization_diagonal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/snippets/Tridiagonalization_diagonal.cpp b/doc/snippets/Tridiagonalization_diagonal.cpp index 30ce77d13..a4a5a9c5a 100644 --- a/doc/snippets/Tridiagonalization_diagonal.cpp +++ b/doc/snippets/Tridiagonalization_diagonal.cpp @@ -3,7 +3,7 @@ MatrixXcd A = X + X.adjoint(); cout << "Here is a random self-adjoint 4x4 matrix:" << endl << A << endl << endl; Tridiagonalization triOfA(A); -MatrixXcd T = triOfA.matrixT(); +MatrixXd T = triOfA.matrixT(); cout << "The tridiagonal matrix T is:" << endl << triOfA.matrixT() << endl << endl; cout << "We can also extract the diagonals of T directly ..." << endl;