From 775f7e5fbb1e40bc227f459415c6a0dcfa5cd61a Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 2 Dec 2014 14:40:19 +0100 Subject: bug #697: make sure empty classes are at the end in case of multiple inheritence --- Eigen/src/Core/CwiseBinaryOp.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Eigen/src/Core/CwiseBinaryOp.h') 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 class CwiseBinaryOpImpl; template -class CwiseBinaryOp : internal::no_assignment_operator, +class CwiseBinaryOp : public CwiseBinaryOpImpl< BinaryOp, LhsType, RhsType, typename internal::cwise_promote_storage_type::StorageKind, typename internal::traits::StorageKind, - BinaryOp>::ret> + BinaryOp>::ret>, + internal::no_assignment_operator { public: -- cgit v1.2.3