From 675b0dd9f0dba64c45da3d957ee2165ed2befa41 Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Sun, 23 Dec 2018 19:33:01 +0100 Subject: [PATCH] fixes.. --- src/include/multi_array.h | 3 +++ src/include/ranges/subrange.h | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/include/multi_array.h b/src/include/multi_array.h index 7b887ae..18ec445 100644 --- a/src/include/multi_array.h +++ b/src/include/multi_array.h @@ -35,6 +35,9 @@ namespace MultiArrayTools typedef MultiArrayBase MAB; typedef ContainerIndex IndexType; + using MultiArrayBase::operator[]; + using MutableMultiArrayBase::operator[]; + DEFAULT_MEMBERS(MultiArray); MultiArray(const std::shared_ptr&... ranges); MultiArray(const std::shared_ptr&... ranges, const T& val); diff --git a/src/include/ranges/subrange.h b/src/include/ranges/subrange.h index 97477ab..d36d129 100644 --- a/src/include/ranges/subrange.h +++ b/src/include/ranges/subrange.h @@ -35,9 +35,9 @@ namespace MultiArrayTools SubIndex(const std::shared_ptr& range); - static constexpr IndexType sType() { return typename Index::sType(); } - static constexpr size_t totalDim() { return typename Index::totalDim(); } - static constexpr size_t sDim() { return typename Index::sDim(); } + static constexpr IndexType sType() { return IndexType::SINGLE; } + static constexpr size_t totalDim() { return 1; } + static constexpr size_t sDim() { return 1; } static constexpr SpaceType STYPE = Index::STYPE;