diff options
-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() {} }; |