diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-09-03 14:14:54 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-09-03 14:14:54 +0200 |
commit | 941a99ac1aba69d26ce56286b1a04edfd07ec5cb (patch) | |
tree | b15af1bd0e04dfa028613399d17aad75b7f12a83 /Eigen/src/Core | |
parent | d91db41a31255302b582e4ebff3852a82ebcf243 (diff) |
Add a few missing EIGEN_DEVICE_FUNC declarations
Diffstat (limited to 'Eigen/src/Core')
-rw-r--r-- | Eigen/src/Core/CoreEvaluators.h | 5 | ||||
-rw-r--r-- | Eigen/src/Core/util/Meta.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Eigen/src/Core/CoreEvaluators.h b/Eigen/src/Core/CoreEvaluators.h index c362dc3b9..2cbb6cd44 100644 --- a/Eigen/src/Core/CoreEvaluators.h +++ b/Eigen/src/Core/CoreEvaluators.h @@ -89,6 +89,7 @@ template<typename T> struct evaluator<const T> : evaluator<T> { + EIGEN_DEVICE_FUNC explicit evaluator(const T& xpr) : evaluator<T>(xpr) {} }; @@ -218,7 +219,7 @@ struct evaluator<Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols> > { typedef Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols> XprType; - evaluator() {} + EIGEN_DEVICE_FUNC evaluator() {} EIGEN_DEVICE_FUNC explicit evaluator(const XprType& m) : evaluator<PlainObjectBase<XprType> >(m) @@ -231,7 +232,7 @@ struct evaluator<Array<Scalar, Rows, Cols, Options, MaxRows, MaxCols> > { typedef Array<Scalar, Rows, Cols, Options, MaxRows, MaxCols> XprType; - evaluator() {} + EIGEN_DEVICE_FUNC evaluator() {} EIGEN_DEVICE_FUNC explicit evaluator(const XprType& m) : evaluator<PlainObjectBase<XprType> >(m) diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h index c6830991c..6eb409194 100644 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h @@ -186,11 +186,11 @@ template<> struct numeric_limits<long long> */ class noncopyable { - noncopyable(const noncopyable&); - const noncopyable& operator=(const noncopyable&); + EIGEN_DEVICE_FUNC noncopyable(const noncopyable&); + EIGEN_DEVICE_FUNC const noncopyable& operator=(const noncopyable&); protected: - noncopyable() {} - ~noncopyable() {} + EIGEN_DEVICE_FUNC noncopyable() {} + EIGEN_DEVICE_FUNC ~noncopyable() {} }; |