Skip to content
Snippets Groups Projects
Commit a79102a3 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'cherry-pick-8b08f9aa' into 'next'

Merge branch 'fix/compiler-warnings' into 'next'

See merge request !439
parents 3da4939c a49a6e59
No related branches found
No related tags found
2 merge requests!617[WIP] Next,!439Merge branch 'fix/compiler-warnings' into 'next'
...@@ -105,11 +105,11 @@ int main() ...@@ -105,11 +105,11 @@ int main()
if (!passed) return 1; if (!passed) return 1;
// we can write also std::arrays (all container providing begin and end) // we can write also std::arrays (all container providing begin and end)
passed = passed && Dumux::testContainerWriter<std::array<double, 2>>(std::array<double, 2>{1.0, 2.0}); passed = passed && Dumux::testContainerWriter<std::array<double, 2>>({{1.0, 2.0}});
passed = passed && Dumux::testContainerWriter<std::array<int, 2>>(std::array<int, 2>{1, 2}); passed = passed && Dumux::testContainerWriter<std::array<int, 2>>({{1, 2}});
passed = passed && Dumux::testContainerWriter<std::array<std::string, 2>>(std::array<std::string, 2>{"1.0", "2.0"}); passed = passed && Dumux::testContainerWriter<std::array<std::string, 2>>({{"1.0", "2.0"}});
passed = passed && Dumux::testContainerWriter<std::array<Dune::FieldVector<double, 3>, 2>>( passed = passed && Dumux::testContainerWriter<std::array<Dune::FieldVector<double, 3>, 2>>(
std::array<Dune::FieldVector<double, 3>, 2>{Dune::FieldVector<double, 3>(0.0), Dune::FieldVector<double, 3>(1.0)}); std::array<Dune::FieldVector<double, 3>, 2>{{Dune::FieldVector<double, 3>(0.0), Dune::FieldVector<double, 3>(1.0)}});
if (!passed) return 1; if (!passed) return 1;
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment