From 697aac6b949c339a0bd21200edd50fc9953057fe Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Wed, 6 Feb 2019 19:34:17 +0100 Subject: [PATCH] rename operation base operator() to to() (avoid conflicts) --- src/include/multi_array_operation.cc.h | 4 ++-- src/include/multi_array_operation.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/multi_array_operation.cc.h b/src/include/multi_array_operation.cc.h index 26ef0cf..4b1abed 100644 --- a/src/include/multi_array_operation.cc.h +++ b/src/include/multi_array_operation.cc.h @@ -89,10 +89,10 @@ namespace MultiArrayTools template template - auto OperationBase::operator()(const std::shared_ptr&... inds) const + auto OperationBase::to(const std::shared_ptr&... inds) const -> MultiArray { - MultiArray out(inds->range()... , static_cast(0)); + MultiArray out(inds->range()...); out(inds...) = THIS(); return out; } diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h index ec6fb5d..a5a3dfe 100644 --- a/src/include/multi_array_operation.h +++ b/src/include/multi_array_operation.h @@ -66,7 +66,7 @@ namespace MultiArrayTools -> ConstOperationRoot; template - auto operator()(const std::shared_ptr&... inds) const + auto to(const std::shared_ptr&... inds) const -> MultiArray; template // Args = Operation Classes