diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 126187aa25..a60e5cb001 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -40,9 +40,7 @@ static inline void check_DenseIndex_is_signed() { */ template class DenseBase #ifndef EIGEN_PARSED_BY_DOXYGEN - : public internal::special_scalar_op_base::Scalar, - typename NumTraits::Scalar>::Real, - DenseCoeffsBase > + : public DenseCoeffsBase #else : public DenseCoeffsBase #endif // not EIGEN_PARSED_BY_DOXYGEN @@ -73,7 +71,7 @@ template class DenseBase typedef Scalar value_type; typedef typename NumTraits::Real RealScalar; - typedef internal::special_scalar_op_base > Base; + typedef DenseCoeffsBase Base; using Base::derived; using Base::const_cast_derived; diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index 8a7e36253b..3605de6fd8 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -450,24 +450,6 @@ struct generic_xpr_base typedef typename dense_xpr_base::type type; }; -/** \internal Helper base class to add a scalar multiple operator - * overloads for complex types */ -template::value > -struct special_scalar_op_base : public BaseType -{ - // dummy operator* so that the - // "using special_scalar_op_base::operator*" compiles - struct dummy {}; - void operator*(dummy) const; - void operator/(dummy) const; -}; - -template -struct special_scalar_op_base : public BaseType -{ -}; - template struct cast_return_type { typedef typename XprType::Scalar CurrentScalarType; diff --git a/Eigen/src/SparseCore/SparseMatrixBase.h b/Eigen/src/SparseCore/SparseMatrixBase.h index 534c56e711..24df368848 100644 --- a/Eigen/src/SparseCore/SparseMatrixBase.h +++ b/Eigen/src/SparseCore/SparseMatrixBase.h @@ -24,13 +24,7 @@ namespace Eigen { * \ref TopicCustomizingEigen by defining the preprocessor symbol \c EIGEN_SPARSEMATRIXBASE_PLUGIN. */ template class SparseMatrixBase -#ifndef EIGEN_PARSED_BY_DOXYGEN - : public internal::special_scalar_op_base::Scalar, - typename NumTraits::Scalar>::Real, - EigenBase > -#else : public EigenBase -#endif // not EIGEN_PARSED_BY_DOXYGEN { public: @@ -142,7 +136,7 @@ template class SparseMatrixBase inline Derived& const_cast_derived() const { return *static_cast(const_cast(this)); } - typedef internal::special_scalar_op_base > Base; + typedef EigenBase Base; #endif // not EIGEN_PARSED_BY_DOXYGEN