From b18d5a39c431897e612e0c7785823740c05fc987 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 9 Jan 2020 10:29:13 +0100 Subject: [PATCH] fixed: use std::make_tuple instead of initializer list the constructor is explicit with gcc5 --- tests/test_ParallelRestart.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 6930efe59..bc56d177f 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1241,7 +1241,9 @@ BOOST_AUTO_TEST_CASE(UniformXTabulatedTwoDFunction) #ifdef HAVE_MPI std::vector xPos{1.0, 2.0}; std::vector yPos{3.0, 4.0}; - std::vector>> samples{{{1.0, 2.0, 3.0}}, {{4.0, 5.0, 6.0}}}; + using SampleType = std::vector>>; + SampleType samples{{std::make_tuple(1.0, 2.0, 3.0)}, + {std::make_tuple(4.0, 5.0, 6.0)}}; using FFuncType = Opm::UniformXTabulated2DFunction; FFuncType val1(xPos, yPos, samples, FFuncType::Vertical); auto val2 = PackUnpack(val1); @@ -1301,7 +1303,7 @@ BOOST_AUTO_TEST_CASE(WetGasPvt) std::vector yPos{3.0, 4.0}; using FFuncType = Opm::UniformXTabulated2DFunction; using Samples = std::vector>; - Samples samples({{{1.0, 2.0, 3.0}, {3.0, 4.0, 5.0}}}); + Samples samples({{std::make_tuple(1.0, 2.0, 3.0), std::make_tuple(3.0, 4.0, 5.0)}}); FFuncType func2(xPos, yPos, samples, FFuncType::Vertical); Opm::WetGasPvt val1({1.0, 2.0}, {3.0, 4.0}, {func2}, {func}, {func2}, @@ -1347,7 +1349,7 @@ BOOST_AUTO_TEST_CASE(LiveOilPvt) std::vector yPos{3.0, 4.0}; using FFuncType = Opm::UniformXTabulated2DFunction; using Samples = std::vector>; - Samples samples({{{1.0, 2.0, 3.0}, {3.0, 4.0, 5.0}}}); + Samples samples({{std::make_tuple(1.0, 2.0, 3.0), std::make_tuple(3.0, 4.0, 5.0)}}); FFuncType func2(xPos, yPos, samples, FFuncType::Vertical); Opm::LiveOilPvt val1({1.0, 2.0}, {3.0, 4.0}, {func2}, {func2}, {func2},