From f47ca055db9567cd7ed4f5dd7b05eed4d2b03c85 Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Mon, 11 Mar 2019 19:24:34 +0100 Subject: [PATCH] some fixes... --- src/include/helper_tools.cc.h | 8 ++++---- src/include/helper_tools.h | 4 ++-- src/include/map_range.cc.h | 4 ++-- src/include/map_range.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/include/helper_tools.cc.h b/src/include/helper_tools.cc.h index d051e1d..7a50193 100644 --- a/src/include/helper_tools.cc.h +++ b/src/include/helper_tools.cc.h @@ -215,17 +215,17 @@ namespace MultiArrayTools template auto metaSlice(const std::shared_ptr& r) - -> ConstSlice + -> ConstSlice { ClassicRF crf(r->size()); - return ConstSlice( createExplicit(crf), &r->get(0) ); + return ConstSlice( createExplicit(crf), &r->get(0) ); } template auto metaSlice(const std::shared_ptr& r, const std::shared_ptr& ro) - -> ConstSlice + -> ConstSlice { - return ConstSlice( ro, &r->get(0) ); + return ConstSlice( ro, &r->get(0) ); } diff --git a/src/include/helper_tools.h b/src/include/helper_tools.h index 58a74f5..895baee 100644 --- a/src/include/helper_tools.h +++ b/src/include/helper_tools.h @@ -97,11 +97,11 @@ namespace MultiArrayTools template auto metaSlice(const std::shared_ptr& r) - -> ConstSlice; + -> ConstSlice; template auto metaSlice(const std::shared_ptr& r, const std::shared_ptr& ro) - -> ConstSlice; + -> ConstSlice; template inline void For(const std::shared_ptr& ind, const std::function& ll) diff --git a/src/include/map_range.cc.h b/src/include/map_range.cc.h index 595e710..10a3402 100644 --- a/src/include/map_range.cc.h +++ b/src/include/map_range.cc.h @@ -563,10 +563,10 @@ namespace MultiArrayTools } template - std::vector GenMapRange::mapPos() const + vector GenMapRange::mapPos() const { auto i = mMapf.begin(); - std::vector out(i.max()); + vector out(i.max()); for(; i.pos() != i.max(); ++i){ out[i.pos()] = mOutRange->getMeta( mMapf[i] ); } diff --git a/src/include/map_range.h b/src/include/map_range.h index 0902fde..2bc9642 100644 --- a/src/include/map_range.h +++ b/src/include/map_range.h @@ -269,7 +269,7 @@ namespace MultiArrayTools const MultiArray& mapMultiplicity() const; MultiArray explMapMultiplicity() const; - std::vector mapPos() const; + vector mapPos() const; /* template