diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-09-19 21:44:14 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-09-19 21:44:14 +0200 |
commit | d16797cfc06b93d30bee0b698e90ddfe5cb456fe (patch) | |
tree | d0480db2bdc38a5f49f8c57b4d0c0b0685c470f0 | |
parent | 13aee4463e2a9bcd13621453a5ca4c9922ea0dda (diff) |
Fix bug #1067: naming conflict
-rwxr-xr-x | Eigen/src/Core/ProductEvaluators.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index d704eedb9..04e5e5e37 100755 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -237,7 +237,7 @@ EIGEN_DONT_INLINE void outer_product_selector_run(Dst& dst, const Lhs &lhs, cons template<typename Lhs, typename Rhs> struct generic_product_impl<Lhs,Rhs,DenseShape,DenseShape,OuterProduct> { - 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 {}; typedef typename Product<Lhs,Rhs>::Scalar Scalar; // TODO it would be nice to be able to exploit our *_assign_op functors for that purpose @@ -255,25 +255,25 @@ struct generic_product_impl<Lhs,Rhs,DenseShape,DenseShape,OuterProduct> template<typename Dst> static inline void evalTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) { - internal::outer_product_selector_run(dst, lhs, rhs, set(), IsRowMajor<Dst>()); + internal::outer_product_selector_run(dst, lhs, rhs, set(), is_row_major<Dst>()); } template<typename Dst> static inline void addTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) { - internal::outer_product_selector_run(dst, lhs, rhs, add(), IsRowMajor<Dst>()); + internal::outer_product_selector_run(dst, lhs, rhs, add(), is_row_major<Dst>()); } template<typename Dst> static inline void subTo(Dst& dst, const Lhs& lhs, const Rhs& rhs) { - internal::outer_product_selector_run(dst, lhs, rhs, sub(), IsRowMajor<Dst>()); + internal::outer_product_selector_run(dst, lhs, rhs, sub(), is_row_major<Dst>()); } template<typename Dst> static inline void scaleAndAddTo(Dst& dst, const Lhs& lhs, const Rhs& rhs, const Scalar& alpha) { - internal::outer_product_selector_run(dst, lhs, rhs, adds(alpha), IsRowMajor<Dst>()); + internal::outer_product_selector_run(dst, lhs, rhs, adds(alpha), is_row_major<Dst>()); } }; |