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

Fix bug #1067: naming conflict

Browse Source
This commit is contained in:
Gael Guennebaud 2015-09-19 21:45:11 +02:00
parent a0bf1b4242
commit d40e32c94e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Eigen/src/Core/GeneralProduct.h
View File

@ -257,7 +257,7 @@ template<typename Lhs, typename Rhs>
class GeneralProduct<Lhs, Rhs, OuterProduct> class GeneralProduct<Lhs, Rhs, OuterProduct>
: public ProductBase<GeneralProduct<Lhs,Rhs,OuterProduct>, Lhs, Rhs> : public ProductBase<GeneralProduct<Lhs,Rhs,OuterProduct>, Lhs, Rhs>
{ {
template<typename T> struct IsRowMajor : internal::conditional<(int(T::Flags)&RowMajorBit), internal::true_type, internal::false_type>::type {}; template<typename T> struct is_row_major : internal::conditional<(int(T::Flags)&RowMajorBit), internal::true_type, internal::false_type>::type {};
public: public:
EIGEN_PRODUCT_PUBLIC_INTERFACE(GeneralProduct) EIGEN_PRODUCT_PUBLIC_INTERFACE(GeneralProduct)
@ -281,22 +281,22 @@ class GeneralProduct<Lhs, Rhs, OuterProduct>
template<typename Dest> template<typename Dest>
inline void evalTo(Dest& dest) const { inline void evalTo(Dest& dest) const {
internal::outer_product_selector_run(*this, dest, set(), IsRowMajor<Dest>()); internal::outer_product_selector_run(*this, dest, set(), is_row_major<Dest>());
} }
template<typename Dest> template<typename Dest>
inline void addTo(Dest& dest) const { inline void addTo(Dest& dest) const {
internal::outer_product_selector_run(*this, dest, add(), IsRowMajor<Dest>()); internal::outer_product_selector_run(*this, dest, add(), is_row_major<Dest>());
} }
template<typename Dest> template<typename Dest>
inline void subTo(Dest& dest) const { inline void subTo(Dest& dest) const {
internal::outer_product_selector_run(*this, dest, sub(), IsRowMajor<Dest>()); internal::outer_product_selector_run(*this, dest, sub(), is_row_major<Dest>());
} }
template<typename Dest> void scaleAndAddTo(Dest& dest, const Scalar& alpha) const template<typename Dest> void scaleAndAddTo(Dest& dest, const Scalar& alpha) const
{ {
internal::outer_product_selector_run(*this, dest, adds(alpha), IsRowMajor<Dest>()); internal::outer_product_selector_run(*this, dest, adds(alpha), is_row_major<Dest>());
} }
}; };