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

Fix compilation of evaluator unit test

Browse Source
This commit is contained in:
Gael Guennebaud 2016-06-14 11:03:26 +02:00
parent 3c12e24164
commit 39781dc1e2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/evaluators.cpp
View File

@ -21,7 +21,7 @@ namespace Eigen {
EIGEN_STRONG_INLINE EIGEN_STRONG_INLINE
DstXprType& copy_using_evaluator(const EigenBase<DstXprType> &dst, const SrcXprType &src) DstXprType& copy_using_evaluator(const EigenBase<DstXprType> &dst, const SrcXprType &src)
{ {
call_assignment(dst.const_cast_derived(), src.derived(), internal::assign_op<typename DstXprType::Scalar>()); call_assignment(dst.const_cast_derived(), src.derived(), internal::assign_op<typename DstXprType::Scalar,typename SrcXprType::Scalar>());
return dst.const_cast_derived(); return dst.const_cast_derived();
} }
@ -29,7 +29,7 @@ namespace Eigen {
EIGEN_STRONG_INLINE EIGEN_STRONG_INLINE
const DstXprType& copy_using_evaluator(const NoAlias<DstXprType, StorageBase>& dst, const SrcXprType &src) const DstXprType& copy_using_evaluator(const NoAlias<DstXprType, StorageBase>& dst, const SrcXprType &src)
{ {
call_assignment(dst, src.derived(), internal::assign_op<typename DstXprType::Scalar>()); call_assignment(dst, src.derived(), internal::assign_op<typename DstXprType::Scalar,typename SrcXprType::Scalar>());
return dst.expression(); return dst.expression();
} }
@ -45,7 +45,7 @@ namespace Eigen {
dst.const_cast_derived().resizeLike(src.derived()); dst.const_cast_derived().resizeLike(src.derived());
#endif #endif
call_assignment(dst.const_cast_derived(), src.derived(), internal::assign_op<typename DstXprType::Scalar>()); call_assignment(dst.const_cast_derived(), src.derived(), internal::assign_op<typename DstXprType::Scalar,typename SrcXprType::Scalar>());
return dst.const_cast_derived(); return dst.const_cast_derived();
} }
@ -53,28 +53,28 @@ namespace Eigen {
void add_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src) void add_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src)
{ {
typedef typename DstXprType::Scalar Scalar; typedef typename DstXprType::Scalar Scalar;
call_assignment(const_cast<DstXprType&>(dst), src.derived(), internal::add_assign_op<Scalar>()); call_assignment(const_cast<DstXprType&>(dst), src.derived(), internal::add_assign_op<Scalar,typename SrcXprType::Scalar>());
} }
template<typename DstXprType, typename SrcXprType> template<typename DstXprType, typename SrcXprType>
void subtract_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src) void subtract_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src)
{ {
typedef typename DstXprType::Scalar Scalar; typedef typename DstXprType::Scalar Scalar;
call_assignment(const_cast<DstXprType&>(dst), src.derived(), internal::sub_assign_op<Scalar>()); call_assignment(const_cast<DstXprType&>(dst), src.derived(), internal::sub_assign_op<Scalar,typename SrcXprType::Scalar>());
} }
template<typename DstXprType, typename SrcXprType> template<typename DstXprType, typename SrcXprType>
void multiply_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src) void multiply_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src)
{ {
typedef typename DstXprType::Scalar Scalar; typedef typename DstXprType::Scalar Scalar;
call_assignment(dst.const_cast_derived(), src.derived(), internal::mul_assign_op<Scalar>()); call_assignment(dst.const_cast_derived(), src.derived(), internal::mul_assign_op<Scalar,typename SrcXprType::Scalar>());
} }
template<typename DstXprType, typename SrcXprType> template<typename DstXprType, typename SrcXprType>
void divide_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src) void divide_assign_using_evaluator(const DstXprType& dst, const SrcXprType& src)
{ {
typedef typename DstXprType::Scalar Scalar; typedef typename DstXprType::Scalar Scalar;
call_assignment(dst.const_cast_derived(), src.derived(), internal::div_assign_op<Scalar>()); call_assignment(dst.const_cast_derived(), src.derived(), internal::div_assign_op<Scalar,typename SrcXprType::Scalar>());
} }
template<typename DstXprType, typename SrcXprType> template<typename DstXprType, typename SrcXprType>