Pulled latest updates from the Eigen main trunk.

3 files changed, 8 insertions, 4 deletions

diff --git a/test/eigen2/CMakeLists.txt b/test/eigen2/CMakeLists.txt
index 84931e037..41a02f4ad 100644
--- a/test/eigen2/CMakeLists.txt
+++ b/test/eigen2/CMakeLists.txt
@@ -5,6 +5,11 @@ add_dependencies(buildtests eigen2_buildtests)
 
 add_definitions("-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API")
 
+# Disable unused warnings for this module
+# As EIGEN2 support is deprecated, it is not really worth fixing them
+ei_add_cxx_compiler_flag("-Wno-unused-local-typedefs")
+ei_add_cxx_compiler_flag("-Wno-unused-but-set-variable")
+
 ei_add_test(eigen2_meta)
 ei_add_test(eigen2_sizeof)
 ei_add_test(eigen2_dynalloc)
diff --git a/test/eigensolver_generic.cpp b/test/eigensolver_generic.cpp
index 91383b5cf..92d33f66a 100644
--- a/test/eigensolver_generic.cpp
+++ b/test/eigensolver_generic.cpp
@@ -114,10 +114,9 @@ void test_eigensolver_generic()
   CALL_SUBTEST_2(
   {
      MatrixXd A(1,1);
-     A(0,0) = std::sqrt(-1.);
+     A(0,0) = std::sqrt(-1.); // is Not-a-Number
      Eigen::EigenSolver<MatrixXd> solver(A);
-     MatrixXd V(1, 1);
-     V(0,0) = solver.eigenvectors()(0,0).real();
+     VERIFY_IS_EQUAL(solver.info(), NumericalIssue);
   }
   );
   
diff --git a/test/packetmath.cpp b/test/packetmath.cpp
index 663ab886d..f4bb544e5 100644
--- a/test/packetmath.cpp
+++ b/test/packetmath.cpp
@@ -186,7 +186,7 @@ template<typename Scalar> void packetmath()
   {
     for (int i=0; i<PacketSize*2; ++i)
       ref[i] = data1[i/PacketSize];
-    Packet A0, A1, A2, A3;
+    Packet A0, A1;
     internal::pbroadcast2<Packet>(data1, A0, A1);
     internal::pstore(data2+0*PacketSize, A0);
     internal::pstore(data2+1*PacketSize, A1);