aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/AlignedVector3
diff options
context:
space:
mode:
authorGravatar Valentin Roussellet <valentin.roussellet@irit.fr>2015-07-21 16:42:52 +0000
committerGravatar Valentin Roussellet <valentin.roussellet@irit.fr>2015-07-21 16:42:52 +0000
commit5e635f9ca104fe17ae651b63536df1fdffaee54e (patch)
tree7b33a0eaf84b475a4e471bbca6266460b1c8c325 /unsupported/Eigen/AlignedVector3
parent45ee14a13a914fd21d00abe799de0039651edcb8 (diff)
AlignedVector3 accepts implicit conversions from more operators.
Diffstat (limited to 'unsupported/Eigen/AlignedVector3')
-rw-r--r--unsupported/Eigen/AlignedVector310
1 files changed, 8 insertions, 2 deletions
diff --git a/unsupported/Eigen/AlignedVector3 b/unsupported/Eigen/AlignedVector3
index 93b017437..ca647eab3 100644
--- a/unsupported/Eigen/AlignedVector3
+++ b/unsupported/Eigen/AlignedVector3
@@ -105,7 +105,7 @@ template<typename _Scalar> class AlignedVector3
};
template<typename Derived>
- inline explicit AlignedVector3(const MatrixBase<Derived>& other)
+ inline AlignedVector3(const MatrixBase<Derived>& other)
{
generic_assign_selector<Derived>::run(*this,other.derived());
}
@@ -113,6 +113,12 @@ template<typename _Scalar> class AlignedVector3
inline AlignedVector3& operator=(const AlignedVector3& other)
{ m_coeffs = other.m_coeffs; return *this; }
+ template <typename Derived>
+ inline AlignedVector3& operator=(const MatrixBase<Derived>& other)
+ {
+ generic_assign_selector<Derived>::run(*this,other.derived());
+ return *this;
+ }
inline AlignedVector3 operator+(const AlignedVector3& other) const
{ return AlignedVector3(m_coeffs + other.m_coeffs); }
@@ -153,7 +159,7 @@ template<typename _Scalar> class AlignedVector3
m_coeffs /= norm();
}
- inline AlignedVector3 normalized()
+ inline AlignedVector3 normalized() const
{
return AlignedVector3(m_coeffs / norm());
}