From 386d9e5ebdff7f986a4f707e965703f2785dc292 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 19 Jun 2015 17:42:27 +0200 Subject: Fix usage of nested versus nested_eval --- Eigen/src/Geometry/AlignedBox.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Eigen/src') diff --git a/Eigen/src/Geometry/AlignedBox.h b/Eigen/src/Geometry/AlignedBox.h index 08ee843db..186d4ecad 100644 --- a/Eigen/src/Geometry/AlignedBox.h +++ b/Eigen/src/Geometry/AlignedBox.h @@ -181,7 +181,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim) template inline bool contains(const MatrixBase& p) const { - typename internal::nested::type p_n(p.derived()); + typename internal::nested_eval::type p_n(p.derived()); return (m_min.array()<=p_n.array()).all() && (p_n.array()<=m_max.array()).all(); } @@ -199,7 +199,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim) template inline AlignedBox& extend(const MatrixBase& p) { - typename internal::nested::type p_n(p.derived()); + typename internal::nested_eval::type p_n(p.derived()); m_min = m_min.cwiseMin(p_n); m_max = m_max.cwiseMax(p_n); return *this; @@ -240,7 +240,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim) template inline AlignedBox& translate(const MatrixBase& a_t) { - const typename internal::nested::type t(a_t.derived()); + const typename internal::nested_eval::type t(a_t.derived()); m_min += t; m_max += t; return *this; @@ -313,7 +313,7 @@ template template inline Scalar AlignedBox::squaredExteriorDistance(const MatrixBase& a_p) const { - typename internal::nested::type p(a_p.derived()); + typename internal::nested_eval::type p(a_p.derived()); Scalar dist2(0); Scalar aux; for (Index k=0; k