From 62c4b8401d4f9c5ef45ee22b198ccb0fd7aa4b57 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Sat, 16 Mar 2019 12:42:12 +0000 Subject: [PATCH] Deeply ugly initialisartion for FloatPairArray type 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 83e799d..fde2f5e 100644 --- a/include/FluidSCWrapper.hpp +++ b/include/FluidSCWrapper.hpp @@ -83,7 +83,7 @@ struct ControlGetter { typename FloatPairsArrayT::type operator()(World *, FloatControlsIter &iter) { - return {{iter.next(), iter.next()}, {iter.next(), iter.next()}}; + return {std::array,2>{{{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 {{args->getf(), args->getf()}, {args->getf(), args->getf()}}; + return {std::array,2>{{{args->getf(), args->getf()}, {args->getf(), args->getf()}}}}; } };