From 941a99ac1aba69d26ce56286b1a04edfd07ec5cb Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 3 Sep 2015 14:14:54 +0200 Subject: [PATCH] Add a few missing EIGEN_DEVICE_FUNC declarations --- Eigen/src/Core/CoreEvaluators.h | 5 +++-- 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 struct evaluator : evaluator { + EIGEN_DEVICE_FUNC explicit evaluator(const T& xpr) : evaluator(xpr) {} }; @@ -218,7 +219,7 @@ struct evaluator > { typedef Matrix XprType; - evaluator() {} + EIGEN_DEVICE_FUNC evaluator() {} EIGEN_DEVICE_FUNC explicit evaluator(const XprType& m) : evaluator >(m) @@ -231,7 +232,7 @@ struct evaluator > { typedef Array XprType; - evaluator() {} + EIGEN_DEVICE_FUNC evaluator() {} EIGEN_DEVICE_FUNC explicit evaluator(const XprType& m) : evaluator >(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 */ 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() {} };