diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-06-19 17:42:27 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-06-19 17:42:27 +0200 |
| commit | 386d9e5ebdff7f986a4f707e965703f2785dc292 (patch) | |
| tree | 9a854e988874254893970089d99f8458d283c502 /Eigen/src/Geometry/AlignedBox.h | |
| parent | a5a7b68b762242022b75b4c816a6501aae112990 (diff) | |
Fix usage of nested versus nested_eval
Diffstat (limited to 'Eigen/src/Geometry/AlignedBox.h')
| -rw-r--r-- | Eigen/src/Geometry/AlignedBox.h | 8 |
1 files changed, 4 insertions, 4 deletions
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<typename Derived> inline bool contains(const MatrixBase<Derived>& p) const { - typename internal::nested<Derived,2>::type p_n(p.derived()); + typename internal::nested_eval<Derived,2>::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<typename Derived> inline AlignedBox& extend(const MatrixBase<Derived>& p) { - typename internal::nested<Derived,2>::type p_n(p.derived()); + typename internal::nested_eval<Derived,2>::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<typename Derived> inline AlignedBox& translate(const MatrixBase<Derived>& a_t) { - const typename internal::nested<Derived,2>::type t(a_t.derived()); + const typename internal::nested_eval<Derived,2>::type t(a_t.derived()); m_min += t; m_max += t; return *this; @@ -313,7 +313,7 @@ template<typename Scalar,int AmbientDim> template<typename Derived> inline Scalar AlignedBox<Scalar,AmbientDim>::squaredExteriorDistance(const MatrixBase<Derived>& a_p) const { - typename internal::nested<Derived,2*AmbientDim>::type p(a_p.derived()); + typename internal::nested_eval<Derived,2*AmbientDim>::type p(a_p.derived()); Scalar dist2(0); Scalar aux; for (Index k=0; k<dim(); ++k) |