Less badness for FloatPairArray

include/FluidSCWrapper.hpp
nix
Owen Green 7 years ago
parent 62c4b8401d
commit 2a22d7d0e7

@ -83,7 +83,7 @@ struct ControlGetter<N, FloatPairsArrayT>
{ {
typename FloatPairsArrayT::type operator()(World *, FloatControlsIter &iter) typename FloatPairsArrayT::type operator()(World *, FloatControlsIter &iter)
{ {
return {std::array<std::pair<double,double>,2>{{{iter.next(), iter.next()}, {iter.next(), iter.next()}}}}; return {iter.next(), iter.next(),iter.next(), iter.next()};
} }
}; };
@ -139,7 +139,7 @@ struct ArgumentGetter<N, FloatPairsArrayT>
{ {
typename FloatPairsArrayT::type operator()(World *w, sc_msg_iter *args) typename FloatPairsArrayT::type operator()(World *w, sc_msg_iter *args)
{ {
return {std::array<std::pair<double,double>,2>{{{args->getf(), args->getf()}, {args->getf(), args->getf()}}}}; return {args->getf(), args->getf(),args->getf(), args->getf()};
} }
}; };

Loading…
Cancel
Save