aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/AlignedVector3
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2010-10-25 10:15:22 -0400
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2010-10-25 10:15:22 -0400
commit4716040703be1ee906439385d20475dcddad5ce3 (patch)
tree8efd3cf3007d8360e66f38e2d280127cbb70daa6 /unsupported/Eigen/AlignedVector3
parentca85a1f6c5fc33ac382aa2d7ba2da63d55d3223e (diff)
bug #86 : use internal:: namespace instead of ei_ prefix
Diffstat (limited to 'unsupported/Eigen/AlignedVector3')
-rw-r--r--unsupported/Eigen/AlignedVector316
1 files changed, 9 insertions, 7 deletions
diff --git a/unsupported/Eigen/AlignedVector3 b/unsupported/Eigen/AlignedVector3
index 7efe4ac21..804142a00 100644
--- a/unsupported/Eigen/AlignedVector3
+++ b/unsupported/Eigen/AlignedVector3
@@ -52,10 +52,12 @@ namespace Eigen {
// TODO specialize Cwise
template<typename _Scalar> class AlignedVector3;
-template<typename _Scalar> struct ei_traits<AlignedVector3<_Scalar> >
- : ei_traits<Matrix<_Scalar,3,1,0,4,1> >
+namespace internal {
+template<typename _Scalar> struct traits<AlignedVector3<_Scalar> >
+ : traits<Matrix<_Scalar,3,1,0,4,1> >
{
};
+}
template<typename _Scalar> class AlignedVector3
: public MatrixBase<AlignedVector3<_Scalar> >
@@ -151,8 +153,8 @@ template<typename _Scalar> class AlignedVector3
inline Scalar dot(const AlignedVector3& other) const
{
- ei_assert(m_coeffs.w()==Scalar(0));
- ei_assert(other.m_coeffs.w()==Scalar(0));
+ eigen_assert(m_coeffs.w()==Scalar(0));
+ eigen_assert(other.m_coeffs.w()==Scalar(0));
return m_coeffs.dot(other.m_coeffs);
}
@@ -168,19 +170,19 @@ template<typename _Scalar> class AlignedVector3
inline Scalar sum() const
{
- ei_assert(m_coeffs.w()==Scalar(0));
+ eigen_assert(m_coeffs.w()==Scalar(0));
return m_coeffs.sum();
}
inline Scalar squaredNorm() const
{
- ei_assert(m_coeffs.w()==Scalar(0));
+ eigen_assert(m_coeffs.w()==Scalar(0));
return m_coeffs.squaredNorm();
}
inline Scalar norm() const
{
- return ei_sqrt(squaredNorm());
+ return internal::sqrt(squaredNorm());
}
inline AlignedVector3 cross(const AlignedVector3& other) const