diff options
author | Gael Guennebaud <g.gael@free.fr> | 2014-12-02 14:40:19 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2014-12-02 14:40:19 +0100 |
commit | 775f7e5fbb1e40bc227f459415c6a0dcfa5cd61a (patch) | |
tree | a112e65e9efe76433c83d321b03169c4850341cc /Eigen/src | |
parent | a819fa148d177c25704b07ae1d84968bbd38051c (diff) |
bug #697: make sure empty classes are at the end in case of multiple inheritence
Diffstat (limited to 'Eigen/src')
-rw-r--r-- | Eigen/src/Core/CwiseBinaryOp.h | 5 | ||||
-rw-r--r-- | Eigen/src/Core/CwiseNullaryOp.h | 3 | ||||
-rw-r--r-- | Eigen/src/Core/CwiseUnaryOp.h | 3 | ||||
-rw-r--r-- | Eigen/src/Core/ReturnByValue.h | 2 | ||||
-rw-r--r-- | Eigen/src/Core/Select.h | 4 | ||||
-rw-r--r-- | Eigen/src/Core/VectorwiseOp.h | 4 | ||||
-rw-r--r-- | Eigen/src/Geometry/Homogeneous.h | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/Eigen/src/Core/CwiseBinaryOp.h b/Eigen/src/Core/CwiseBinaryOp.h index de9109e53..a205c3f10 100644 --- a/Eigen/src/Core/CwiseBinaryOp.h +++ b/Eigen/src/Core/CwiseBinaryOp.h @@ -75,12 +75,13 @@ template<typename BinaryOp, typename Lhs, typename Rhs, typename StorageKind> class CwiseBinaryOpImpl; template<typename BinaryOp, typename LhsType, typename RhsType> -class CwiseBinaryOp : internal::no_assignment_operator, +class CwiseBinaryOp : public CwiseBinaryOpImpl< BinaryOp, LhsType, RhsType, typename internal::cwise_promote_storage_type<typename internal::traits<LhsType>::StorageKind, typename internal::traits<RhsType>::StorageKind, - BinaryOp>::ret> + BinaryOp>::ret>, + internal::no_assignment_operator { public: diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index 8b8397da6..05c4fedd0 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -41,8 +41,7 @@ struct traits<CwiseNullaryOp<NullaryOp, PlainObjectType> > : traits<PlainObjectT } template<typename NullaryOp, typename PlainObjectType> -class CwiseNullaryOp : internal::no_assignment_operator, - public internal::dense_xpr_base< CwiseNullaryOp<NullaryOp, PlainObjectType> >::type +class CwiseNullaryOp : public internal::dense_xpr_base< CwiseNullaryOp<NullaryOp, PlainObjectType> >::type, internal::no_assignment_operator { public: diff --git a/Eigen/src/Core/CwiseUnaryOp.h b/Eigen/src/Core/CwiseUnaryOp.h index 708e3e818..da1d1992d 100644 --- a/Eigen/src/Core/CwiseUnaryOp.h +++ b/Eigen/src/Core/CwiseUnaryOp.h @@ -53,8 +53,7 @@ template<typename UnaryOp, typename XprType, typename StorageKind> class CwiseUnaryOpImpl; template<typename UnaryOp, typename XprType> -class CwiseUnaryOp : internal::no_assignment_operator, - public CwiseUnaryOpImpl<UnaryOp, XprType, typename internal::traits<XprType>::StorageKind> +class CwiseUnaryOp : public CwiseUnaryOpImpl<UnaryOp, XprType, typename internal::traits<XprType>::StorageKind>, internal::no_assignment_operator { public: diff --git a/Eigen/src/Core/ReturnByValue.h b/Eigen/src/Core/ReturnByValue.h index 4e2a81b56..af01a5567 100644 --- a/Eigen/src/Core/ReturnByValue.h +++ b/Eigen/src/Core/ReturnByValue.h @@ -49,7 +49,7 @@ struct nested_eval<ReturnByValue<Derived>, n, PlainObject> } // end namespace internal template<typename Derived> class ReturnByValue - : internal::no_assignment_operator, public internal::dense_xpr_base< ReturnByValue<Derived> >::type + : public internal::dense_xpr_base< ReturnByValue<Derived> >::type, internal::no_assignment_operator { public: typedef typename internal::traits<Derived>::ReturnType ReturnType; diff --git a/Eigen/src/Core/Select.h b/Eigen/src/Core/Select.h index 0c09a4ff4..79eec1b5b 100644 --- a/Eigen/src/Core/Select.h +++ b/Eigen/src/Core/Select.h @@ -49,8 +49,8 @@ struct traits<Select<ConditionMatrixType, ThenMatrixType, ElseMatrixType> > } template<typename ConditionMatrixType, typename ThenMatrixType, typename ElseMatrixType> -class Select : internal::no_assignment_operator, - public internal::dense_xpr_base< Select<ConditionMatrixType, ThenMatrixType, ElseMatrixType> >::type +class Select : public internal::dense_xpr_base< Select<ConditionMatrixType, ThenMatrixType, ElseMatrixType> >::type, + internal::no_assignment_operator { public: diff --git a/Eigen/src/Core/VectorwiseOp.h b/Eigen/src/Core/VectorwiseOp.h index 2815a16c9..a626310ec 100644 --- a/Eigen/src/Core/VectorwiseOp.h +++ b/Eigen/src/Core/VectorwiseOp.h @@ -55,8 +55,8 @@ struct traits<PartialReduxExpr<MatrixType, MemberOp, Direction> > } template< typename MatrixType, typename MemberOp, int Direction> -class PartialReduxExpr : internal::no_assignment_operator, - public internal::dense_xpr_base< PartialReduxExpr<MatrixType, MemberOp, Direction> >::type +class PartialReduxExpr : public internal::dense_xpr_base< PartialReduxExpr<MatrixType, MemberOp, Direction> >::type, + internal::no_assignment_operator { public: diff --git a/Eigen/src/Geometry/Homogeneous.h b/Eigen/src/Geometry/Homogeneous.h index ede203ef9..7f1907542 100644 --- a/Eigen/src/Geometry/Homogeneous.h +++ b/Eigen/src/Geometry/Homogeneous.h @@ -58,7 +58,7 @@ template<typename MatrixType,typename Rhs> struct homogeneous_right_product_impl } // end namespace internal template<typename MatrixType,int _Direction> class Homogeneous - : internal::no_assignment_operator, public MatrixBase<Homogeneous<MatrixType,_Direction> > + : public MatrixBase<Homogeneous<MatrixType,_Direction> >, internal::no_assignment_operator { public: |