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

bug #1575: fix regression introduced in bug #1573 patch. Move ctor/assignment should not be defaulted.

Browse Source
This commit is contained in:
Gael Guennebaud 2018-07-18 23:26:13 +02:00
parent 308725c3c9
commit a503fc8725
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Eigen/src/Geometry/Quaternion.h
View File

@ -105,22 +105,6 @@ class QuaternionBase : public RotationBase<Derived, 3>
EIGEN_DEVICE_FUNC Derived& operator=(const AngleAxisType& aa); EIGEN_DEVICE_FUNC Derived& operator=(const AngleAxisType& aa);
template<class OtherDerived> EIGEN_DEVICE_FUNC Derived& operator=(const MatrixBase<OtherDerived>& m); template<class OtherDerived> EIGEN_DEVICE_FUNC Derived& operator=(const MatrixBase<OtherDerived>& m);
#if EIGEN_HAS_RVALUE_REFERENCES
// Because we have a user-defined copy assignment operator, we don't get an implicit move constructor or assignment operator.
/** Default move constructor */
EIGEN_DEVICE_FUNC inline QuaternionBase(QuaternionBase&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_constructible<Scalar>::value) = default;
/** Default move assignment operator */
EIGEN_DEVICE_FUNC QuaternionBase& operator=(QuaternionBase&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_assignable<Scalar>::value) = default;
// And now because we declared a constructor, we don't get a default constructor or copy constructor. Say we want them.
/** Default constructor */
EIGEN_DEVICE_FUNC QuaternionBase() = default;
/** Copy constructor */
EIGEN_DEVICE_FUNC QuaternionBase(const QuaternionBase& other) = default;
#endif
/** \returns a quaternion representing an identity rotation /** \returns a quaternion representing an identity rotation
* \sa MatrixBase::Identity() * \sa MatrixBase::Identity()
*/ */
@ -295,14 +279,24 @@ public:
#if EIGEN_HAS_RVALUE_REFERENCES #if EIGEN_HAS_RVALUE_REFERENCES
// We define a copy constructor, which means we don't get an implicit move constructor or assignment operator. // We define a copy constructor, which means we don't get an implicit move constructor or assignment operator.
/** Default move constructor */ /** Default move constructor */
EIGEN_DEVICE_FUNC inline Quaternion(Quaternion&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_constructible<Scalar>::value) = default; EIGEN_DEVICE_FUNC inline Quaternion(Quaternion&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_constructible<Scalar>::value)
{
m_coeffs(std::move(other.coeffs()));
}
/** Default move assignment operator */ /** Default move assignment operator */
EIGEN_DEVICE_FUNC Quaternion& operator=(Quaternion&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_assignable<Scalar>::value) = default; EIGEN_DEVICE_FUNC Quaternion& operator=(Quaternion&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_assignable<Scalar>::value)
{
m_coeffs = std::move(other.coeffs());
return *this;
}
// And now because we declared a constructor, we don't get an implicit copy constructor. Say we want one. // And now because we declared a constructor, we don't get an implicit copy constructor. Say we want one.
/** Default copy constructor */ /** Default copy constructor */
EIGEN_DEVICE_FUNC Quaternion(const Quaternion& other) = default; EIGEN_DEVICE_FUNC Quaternion(const Quaternion& other)
{
m_coeffs = other.coeffs();
}
#endif #endif
EIGEN_DEVICE_FUNC static Quaternion UnitRandom(); EIGEN_DEVICE_FUNC static Quaternion UnitRandom();
@ -657,7 +651,7 @@ EIGEN_DEVICE_FUNC Quaternion<Scalar,Options> Quaternion<Scalar,Options>::UnitRan
const Scalar u1 = internal::random<Scalar>(0, 1), const Scalar u1 = internal::random<Scalar>(0, 1),
u2 = internal::random<Scalar>(0, 2*EIGEN_PI), u2 = internal::random<Scalar>(0, 2*EIGEN_PI),
u3 = internal::random<Scalar>(0, 2*EIGEN_PI); u3 = internal::random<Scalar>(0, 2*EIGEN_PI);
const Scalar a = sqrt(1 - u1), const Scalar a = sqrt(Scalar(1) - u1),
b = sqrt(u1); b = sqrt(u1);
return Quaternion (a * sin(u2), a * cos(u2), b * sin(u3), b * cos(u3)); return Quaternion (a * sin(u2), a * cos(u2), b * sin(u3), b * cos(u3));
} }