aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Eigen/Core4
-rwxr-xr-xEigen/src/Core/util/Meta.h7
2 files changed, 4 insertions, 7 deletions
diff --git a/Eigen/Core b/Eigen/Core
index fd6edc018..2ab44fb3c 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -80,6 +80,10 @@
// for min/max:
#include <algorithm>
+#if EIGEN_HAS_CXX11
+#include <array>
+#endif
+
// for std::is_nothrow_move_assignable
#ifdef EIGEN_INCLUDE_TYPE_TRAITS
#include <type_traits>
diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h
index 33dc0034c..748f24b1e 100755
--- a/Eigen/src/Core/util/Meta.h
+++ b/Eigen/src/Core/util/Meta.h
@@ -360,13 +360,6 @@ template<typename T, int N> struct array_size<T (&)[N]> {
};
#if EIGEN_HAS_CXX11
-}}
-namespace std {
- template<class T, std::size_t N> struct array;
-}
-namespace Eigen {
-namespace internal {
-
template<typename T, std::size_t N> struct array_size<const std::array<T,N> > {
enum { value = N };
};