GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-14 20:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of nested versus nested_eval

Browse Source
This commit is contained in:
Gael Guennebaud 2015-06-19 17:42:27 +02:00
parent a5a7b68b76
commit 386d9e5ebd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Geometry/AlignedBox.h
View File

@ -181,7 +181,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim)
template<typename Derived> template<typename Derived>
inline bool contains(const MatrixBase<Derived>& p) const 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(); 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> template<typename Derived>
inline AlignedBox& extend(const MatrixBase<Derived>& p) 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_min = m_min.cwiseMin(p_n);
m_max = m_max.cwiseMax(p_n); m_max = m_max.cwiseMax(p_n);
return *this; return *this;
@ -240,7 +240,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim)
template<typename Derived> template<typename Derived>
inline AlignedBox& translate(const MatrixBase<Derived>& a_t) 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_min += t;
m_max += t; m_max += t;
return *this; return *this;
@ -313,7 +313,7 @@ template<typename Scalar,int AmbientDim>
template<typename Derived> template<typename Derived>
inline Scalar AlignedBox<Scalar,AmbientDim>::squaredExteriorDistance(const MatrixBase<Derived>& a_p) const 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 dist2(0);
Scalar aux; Scalar aux;
for (Index k=0; k<dim(); ++k) for (Index k=0; k<dim(); ++k)