Backed out previous changeset: Does not compile.

There is no member Nested in NumTraits.
This commit is contained in:
Jitse Niesen 2009-11-06 09:16:25 +00:00
parent fe81b3f651
commit 1470afda5b

View File

@ -350,7 +350,7 @@ struct ei_scalar_multiple_op {
EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a * m_other; } EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a * m_other; }
EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const
{ return ei_pmul(a, ei_pset1(m_other)); } { return ei_pmul(a, ei_pset1(m_other)); }
const typename NumTraits<Scalar>::Nested m_other; const Scalar m_other;
private: private:
ei_scalar_multiple_op& operator=(const ei_scalar_multiple_op&); ei_scalar_multiple_op& operator=(const ei_scalar_multiple_op&);
}; };
@ -364,7 +364,7 @@ struct ei_scalar_multiple2_op {
EIGEN_STRONG_INLINE ei_scalar_multiple2_op(const ei_scalar_multiple2_op& other) : m_other(other.m_other) { } EIGEN_STRONG_INLINE ei_scalar_multiple2_op(const ei_scalar_multiple2_op& other) : m_other(other.m_other) { }
EIGEN_STRONG_INLINE ei_scalar_multiple2_op(const Scalar2& other) : m_other(other) { } EIGEN_STRONG_INLINE ei_scalar_multiple2_op(const Scalar2& other) : m_other(other) { }
EIGEN_STRONG_INLINE result_type operator() (const Scalar1& a) const { return a * m_other; } EIGEN_STRONG_INLINE result_type operator() (const Scalar1& a) const { return a * m_other; }
const typename NumTraits<Scalar2>::Nested m_other; const Scalar2 m_other;
}; };
template<typename Scalar1,typename Scalar2> template<typename Scalar1,typename Scalar2>
struct ei_functor_traits<ei_scalar_multiple2_op<Scalar1,Scalar2> > struct ei_functor_traits<ei_scalar_multiple2_op<Scalar1,Scalar2> >
@ -393,7 +393,7 @@ struct ei_scalar_quotient1_impl<Scalar,false> {
EIGEN_STRONG_INLINE ei_scalar_quotient1_impl(const ei_scalar_quotient1_impl& other) : m_other(other.m_other) { } EIGEN_STRONG_INLINE ei_scalar_quotient1_impl(const ei_scalar_quotient1_impl& other) : m_other(other.m_other) { }
EIGEN_STRONG_INLINE ei_scalar_quotient1_impl(const Scalar& other) : m_other(other) {} EIGEN_STRONG_INLINE ei_scalar_quotient1_impl(const Scalar& other) : m_other(other) {}
EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a / m_other; } EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a / m_other; }
const typename NumTraits<Scalar>::Nested m_other; const Scalar m_other;
}; };
template<typename Scalar> template<typename Scalar>
struct ei_functor_traits<ei_scalar_quotient1_impl<Scalar,false> > struct ei_functor_traits<ei_scalar_quotient1_impl<Scalar,false> >