From 2a22d7d0e74f65aa2ce92ef8e0670c8ca98556ca Mon Sep 17 00:00:00 2001 From: Owen Green Date: Sat, 16 Mar 2019 13:09:10 +0000 Subject: [PATCH] Less badness for FloatPairArray include/FluidSCWrapper.hpp --- include/FluidSCWrapper.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/FluidSCWrapper.hpp b/include/FluidSCWrapper.hpp index fde2f5e..b2934ac 100644 --- a/include/FluidSCWrapper.hpp +++ b/include/FluidSCWrapper.hpp @@ -83,7 +83,7 @@ struct ControlGetter { typename FloatPairsArrayT::type operator()(World *, FloatControlsIter &iter) { - return {std::array,2>{{{iter.next(), iter.next()}, {iter.next(), iter.next()}}}}; + return {iter.next(), iter.next(),iter.next(), iter.next()}; } }; @@ -139,7 +139,7 @@ struct ArgumentGetter { typename FloatPairsArrayT::type operator()(World *w, sc_msg_iter *args) { - return {std::array,2>{{{args->getf(), args->getf()}, {args->getf(), args->getf()}}}}; + return {args->getf(), args->getf(),args->getf(), args->getf()}; } };