diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-01-28 11:23:02 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-01-28 11:23:02 +0100 |
| commit | 837f1ae59c7e71a0524410271d1553b1d0e77e66 (patch) | |
| tree | 5dd0959ac3010ed84e1f10c41b5345546d41e513 /unsupported/Eigen/src/AutoDiff | |
| parent | ddfd288dc9883500a6a15d53b9da959ec9959e16 (diff) | |
fix compilation with old gcc
Diffstat (limited to 'unsupported/Eigen/src/AutoDiff')
| -rw-r--r-- | unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h b/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h index a878b221f..455adcadb 100644 --- a/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h +++ b/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h @@ -478,8 +478,8 @@ struct scalar_product_traits<AutoDiffScalar<DerType>,T> inline const Eigen::AutoDiffScalar<Eigen::CwiseUnaryOp<Eigen::internal::scalar_multiple_op<typename Eigen::internal::traits<typename Eigen::internal::remove_all<DerType>::type>::Scalar>, const typename Eigen::internal::remove_all<DerType>::type> > \ FUNC(const Eigen::AutoDiffScalar<DerType>& x) { \ using namespace Eigen; \ - typedef typename internal::traits<typename internal::remove_all<DerType>::type>::Scalar Scalar; \ - typedef AutoDiffScalar<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const typename internal::remove_all<DerType>::type> > ReturnType; \ + typedef typename Eigen::internal::traits<typename Eigen::internal::remove_all<DerType>::type>::Scalar Scalar; \ + typedef AutoDiffScalar<CwiseUnaryOp<Eigen::internal::scalar_multiple_op<Scalar>, const typename Eigen::internal::remove_all<DerType>::type> > ReturnType; \ CODE; \ } @@ -510,8 +510,8 @@ namespace std pow(const Eigen::AutoDiffScalar<DerType>& x, typename Eigen::internal::traits<DerType>::Scalar y) { using namespace Eigen; - typedef typename internal::traits<DerType>::Scalar Scalar; - return AutoDiffScalar<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const DerType> >( + typedef typename Eigen::internal::traits<DerType>::Scalar Scalar; + return AutoDiffScalar<CwiseUnaryOp<Eigen::internal::scalar_multiple_op<Scalar>, const DerType> >( std::pow(x.value(),y), x.derivatives() * (y * std::pow(x.value(),y-1))); } |