From 8e817b65d02e6f6c2d4a0d0085212db0abe6c485 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Wed, 25 Feb 2015 17:46:20 -0800
Subject: Silenced a few more compilation warnings generated by nvcc

---
 unsupported/Eigen/CXX11/src/Tensor/TensorRef.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorRef.h')

diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h b/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h
index 0a87e67eb..acdbc181d 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h
@@ -20,11 +20,11 @@ class TensorLazyBaseEvaluator {
   TensorLazyBaseEvaluator() : m_refcount(0) { }
   virtual ~TensorLazyBaseEvaluator() { }
 
-  virtual const Dimensions& dimensions() const = 0;
-  virtual const Scalar* data() const = 0;
+  EIGEN_DEVICE_FUNC virtual const Dimensions& dimensions() const = 0;
+  EIGEN_DEVICE_FUNC virtual const Scalar* data() const = 0;
 
-  virtual const Scalar coeff(DenseIndex index) const = 0;
-  virtual Scalar& coeffRef(DenseIndex index) = 0;
+  EIGEN_DEVICE_FUNC virtual const Scalar coeff(DenseIndex index) const = 0;
+  EIGEN_DEVICE_FUNC virtual Scalar& coeffRef(DenseIndex index) = 0;
 
   void incrRefCount() { ++m_refcount; }
   void decrRefCount() { --m_refcount; }
@@ -38,7 +38,6 @@ class TensorLazyBaseEvaluator {
   int m_refcount;
 };
 
-static char dummy[8];
 
 template <typename Dimensions, typename Expr, typename Device>
 class TensorLazyEvaluatorReadOnly : public TensorLazyBaseEvaluator<Dimensions, typename TensorEvaluator<Expr, Device>::Scalar> {
@@ -46,7 +45,7 @@ class TensorLazyEvaluatorReadOnly : public TensorLazyBaseEvaluator<Dimensions, t
   //  typedef typename TensorEvaluator<Expr, Device>::Dimensions Dimensions;
   typedef typename TensorEvaluator<Expr, Device>::Scalar Scalar;
 
-  TensorLazyEvaluatorReadOnly(const Expr& expr, const Device& device) : m_impl(expr, device) {
+  TensorLazyEvaluatorReadOnly(const Expr& expr, const Device& device) : m_impl(expr, device), m_dummy(Scalar(0)) {
     m_dims = m_impl.dimensions();
     m_impl.evalSubExprsIfNeeded(NULL);
   }
@@ -54,24 +53,25 @@ class TensorLazyEvaluatorReadOnly : public TensorLazyBaseEvaluator<Dimensions, t
     m_impl.cleanup();
   }
 
-  virtual const Dimensions& dimensions() const {
+  EIGEN_DEVICE_FUNC virtual const Dimensions& dimensions() const {
     return m_dims;
   }
-  virtual const Scalar* data() const {
+  EIGEN_DEVICE_FUNC virtual const Scalar* data() const {
     return m_impl.data();
   }
 
-  virtual const Scalar coeff(DenseIndex index) const {
+  EIGEN_DEVICE_FUNC virtual const Scalar coeff(DenseIndex index) const {
     return m_impl.coeff(index);
   }
-  virtual Scalar& coeffRef(DenseIndex /*index*/) {
+  EIGEN_DEVICE_FUNC virtual Scalar& coeffRef(DenseIndex /*index*/) {
     eigen_assert(false && "can't reference the coefficient of a rvalue");
-    return *reinterpret_cast<Scalar*>(dummy);
+    return m_dummy;
   };
 
  protected:
   TensorEvaluator<Expr, Device> m_impl;
   Dimensions m_dims;
+  Scalar m_dummy;
 };
 
 template <typename Dimensions, typename Expr, typename Device>
@@ -85,7 +85,7 @@ class TensorLazyEvaluatorWritable : public TensorLazyEvaluatorReadOnly<Dimension
   virtual ~TensorLazyEvaluatorWritable() {
   }
 
-  virtual Scalar& coeffRef(DenseIndex index) {
+  EIGEN_DEVICE_FUNC virtual Scalar& coeffRef(DenseIndex index) {
     return this->m_impl.coeffRef(index);
   }
 };
@@ -389,7 +389,7 @@ struct TensorEvaluator<const TensorRef<Derived>, Device>
     return m_ref.coeffRef(index);
   }
 
-  Scalar* data() const { return m_ref.data(); }
+  EIGEN_DEVICE_FUNC Scalar* data() const { return m_ref.data(); }
 
  protected:
   TensorRef<Derived> m_ref;
-- 
cgit v1.2.3