aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/CXX11/src/Tensor
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2014-10-31 00:04:13 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2014-10-31 00:04:13 -0700
commit85c3389b2845c5bece37dfb155053aef22ea4138 (patch)
tree59e7a63163a70730da75c6040bc399d59199129f /unsupported/Eigen/CXX11/src/Tensor
parent67fcf47ecb8f0792c0c4695f50d52847b8219ded (diff)
Fixed a test
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor')
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h3
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorRef.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h
index 2dd8e274b..c5965065e 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h
@@ -385,6 +385,9 @@ static const size_t value = Sizes<Indices...>::count;
template <typename std::size_t... Indices> struct array_size<Sizes<Indices...> > {
static const size_t value = Sizes<Indices...>::count;
};
+ template <std::size_t n, typename std::size_t... Indices> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE std::size_t array_get(const Sizes<Indices...>) {
+ return get<n, typename Sizes<Indices...>::Base>::value;
+};
#else
template <std::size_t V1, std::size_t V2, std::size_t V3, std::size_t V4, std::size_t V5> struct array_size<const Sizes<V1,V2,V3,V4,V5> > {
static const size_t value = Sizes<V1,V2,V3,V4,V5>::count;
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h b/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h
index db2027a5f..d43fb286e 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorRef.h
@@ -64,7 +64,7 @@ class TensorLazyEvaluatorReadOnly : public TensorLazyBaseEvaluator<Dimensions, t
virtual const Scalar coeff(DenseIndex index) const {
return m_impl.coeff(index);
}
- virtual Scalar& coeffRef(DenseIndex index) {
+ virtual Scalar& coeffRef(DenseIndex) {
eigen_assert(false && "can't reference the coefficient of a rvalue");
return *reinterpret_cast<Scalar*>(dummy);
};