GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-03 02:30:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Gael Guennebaud 2016-07-18 14:51:53 +02:00
commit 83c726b343
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Eigen/src/Core/Transpose.h
View File

@ -331,11 +331,11 @@ inline void MatrixBase<Derived>::adjointInPlace()
namespace internal { namespace internal {
template<typename BinOp,typename NestedXpr,typename Rhs> template<typename BinOp,typename Xpr,typename Rhs>
struct blas_traits<SelfCwiseBinaryOp<BinOp,NestedXpr,Rhs> > struct blas_traits<SelfCwiseBinaryOp<BinOp,Xpr,Rhs> >
: blas_traits<NestedXpr> : blas_traits<typename internal::remove_all<typename Xpr::Nested>::type>
{ {
typedef SelfCwiseBinaryOp<BinOp,NestedXpr,Rhs> XprType; typedef SelfCwiseBinaryOp<BinOp,Xpr,Rhs> XprType;
static inline const XprType extract(const XprType& x) { return x; } static inline const XprType extract(const XprType& x) { return x; }
}; };
@ -392,7 +392,6 @@ struct checkTransposeAliasing_impl
::run(extract_data(dst), other)) ::run(extract_data(dst), other))
&& "aliasing detected during transposition, use transposeInPlace() " && "aliasing detected during transposition, use transposeInPlace() "
"or evaluate the rhs into a temporary using .eval()"); "or evaluate the rhs into a temporary using .eval()");
} }
}; };