Fixed a test

This commit is contained in:
Benoit Steiner 2014-10-31 00:04:13 -07:00
parent 67fcf47ecb
commit 85c3389b28
3 changed files with 5 additions and 2 deletions

View File

@ -384,6 +384,9 @@ static const size_t value = Sizes<Indices...>::count;
}; };
template <typename std::size_t... Indices> struct array_size<Sizes<Indices...> > { template <typename std::size_t... Indices> struct array_size<Sizes<Indices...> > {
static const size_t value = Sizes<Indices...>::count; 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 #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> > { 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> > {

View File

@ -64,7 +64,7 @@ class TensorLazyEvaluatorReadOnly : public TensorLazyBaseEvaluator<Dimensions, t
virtual const Scalar coeff(DenseIndex index) const { virtual const Scalar coeff(DenseIndex index) const {
return m_impl.coeff(index); 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"); eigen_assert(false && "can't reference the coefficient of a rvalue");
return *reinterpret_cast<Scalar*>(dummy); return *reinterpret_cast<Scalar*>(dummy);
}; };

View File

@ -100,7 +100,7 @@ if(EIGEN_TEST_CXX11)
ei_add_test(cxx11_meta "-std=c++0x") ei_add_test(cxx11_meta "-std=c++0x")
ei_add_test(cxx11_tensor_simple "-std=c++0x") ei_add_test(cxx11_tensor_simple "-std=c++0x")
ei_add_test(cxx11_tensor_symmetry "-std=c++0x") ei_add_test(cxx11_tensor_symmetry "-std=c++0x")
# ei_add_test(cxx11_tensor_assign "-std=c++0x") ei_add_test(cxx11_tensor_assign "-std=c++0x")
# ei_add_test(cxx11_tensor_dimension "-std=c++0x") # ei_add_test(cxx11_tensor_dimension "-std=c++0x")
ei_add_test(cxx11_tensor_comparisons "-std=c++0x") ei_add_test(cxx11_tensor_comparisons "-std=c++0x")
ei_add_test(cxx11_tensor_contraction "-std=c++0x") ei_add_test(cxx11_tensor_contraction "-std=c++0x")