diff options
author | Gael Guennebaud <g.gael@free.fr> | 2008-10-26 20:43:05 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2008-10-26 20:43:05 +0000 |
commit | ca048aaf775477a14ac1764b577103c612a12efc (patch) | |
tree | 00fc03e55c6568749f28d87552cad8b9e5de1000 | |
parent | 94f6f2a7de5c06c331fc491eab39b0c9cc0495b9 (diff) |
fix compilation with gcc 4.3
-rw-r--r-- | Eigen/Geometry | 1 | ||||
-rw-r--r-- | Eigen/src/Geometry/AlignedBox.h | 16 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Eigen/Geometry b/Eigen/Geometry index 883c2d769..19be347fb 100644 --- a/Eigen/Geometry +++ b/Eigen/Geometry @@ -2,6 +2,7 @@ #define EIGEN_GEOMETRY_MODULE_H #include "Array" +#include <limits> #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/Eigen/src/Geometry/AlignedBox.h b/Eigen/src/Geometry/AlignedBox.h index a81cc5474..fb6d3d0a7 100644 --- a/Eigen/src/Geometry/AlignedBox.h +++ b/Eigen/src/Geometry/AlignedBox.h @@ -29,12 +29,12 @@ * * \class AlignedBox * - * \brief A box aligned with a axis + * \brief An axis aligned box * * \param _Scalar the type of the scalar coefficients * \param _AmbientDim the dimension of the ambient space, can be a compile time value or Dynamic. * - * This class represents an axis aligned box as the pair of the minimal and maximal corners. + * This class represents an axis aligned box as a pair of the minimal and maximal corners. */ template <typename _Scalar, int _AmbientDim> class AlignedBox @@ -107,6 +107,10 @@ public: inline AlignedBox& clamp(const AlignedBox& b) { m_min = m_min.cwise().max(b.m_min); m_max = m_max.cwise().min(b.m_max); return *this; } + /** Translate \c *this by the vector \a t and returns a reference to \c *this. */ + inline AlignedBox& translate(const VectorType& t) + { m_min += t; m_max += t; return *this; } + /** \returns the squared distance between the point \a p and the box \c *this, * and zero if \a p is inside the box. * \sa exteriorDistance() @@ -120,14 +124,6 @@ public: inline Scalar exteriorDistance(const VectorType& p) const { return ei_sqrt(squaredExteriorDistance(p)); } - /** Translate \c *this by the vector \a t and returns a reference to \c *this. */ - inline AlignedBox& translate(const VectorType& t) - { - m_min += t; - m_max += t; - return *this; - } - /** \returns \c *this with scalar type casted to \a NewScalarType * * Note that if \a NewScalarType is equal to the current scalar type of \c *this |