diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-06-24 09:52:25 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-06-24 09:52:25 +0200 |
commit | deb45ad4bc5542b7c66cfb3b465ac106294c3ddd (patch) | |
tree | 1fdcfe2ca52c42371fd249d4c20d19b37ca8c46e /Eigen/src/Core | |
parent | a9c1e4d7b7ce7c9dc5310cee1ed13fdef08e506e (diff) |
bug #1245: fix compilation with msvc
Diffstat (limited to 'Eigen/src/Core')
-rw-r--r-- | Eigen/src/Core/util/ForwardDeclarations.h | 1 | ||||
-rw-r--r-- | Eigen/src/Core/util/Meta.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/ForwardDeclarations.h b/Eigen/src/Core/util/ForwardDeclarations.h index 830f20f90..1c90c0e2b 100644 --- a/Eigen/src/Core/util/ForwardDeclarations.h +++ b/Eigen/src/Core/util/ForwardDeclarations.h @@ -131,7 +131,6 @@ template<typename ExpressionType> class ArrayWrapper; template<typename ExpressionType> class MatrixWrapper; template<typename Derived> class SolverBase; template<typename XprType> class InnerIterator; -template<typename ScalarA, typename ScalarB, typename BinaryOp=void> struct ScalarBinaryOpTraits; namespace internal { template<typename DecompositionType> struct kernel_retval_base; diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h index a4a491ff8..02b3d961a 100644 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h @@ -439,7 +439,7 @@ T div_ceil(const T &a, const T &b) * * \sa CwiseBinaryOp */ -template<typename ScalarA, typename ScalarB, typename BinaryOp> +template<typename ScalarA, typename ScalarB, typename BinaryOp=void> struct ScalarBinaryOpTraits #ifndef EIGEN_PARSED_BY_DOXYGEN // for backward compatibility, use the hints given by the (deprecated) internal::scalar_product_traits class. |