diff --git a/dune/common/test/hybridutilitiestest.cc b/dune/common/test/hybridutilitiestest.cc index c6607e8d464d10725381f1a3a83b73df8f2aba17..77d1ee31df992085eef4df43f2ad933b80c7cba8 100644 --- a/dune/common/test/hybridutilitiestest.cc +++ b/dune/common/test/hybridutilitiestest.cc @@ -36,8 +36,9 @@ template<class C> auto incAndAppendToFirst(C&& c) { using namespace Dune::Hybrid; - using namespace Dune::Indices; forEach(integralRange(Dune::Hybrid::size(c)), [&](auto&& i) { + using namespace Dune::Hybrid; + using namespace Dune::Indices; ifElse(equals(i, _0), [&](auto id) { id(c[i]).append("+1"); }, [&](auto id) { @@ -60,10 +61,9 @@ template<class C, class I> auto sumSubsequence(C&& c, I&& indices) { using namespace Dune::Hybrid; - using namespace Dune::Indices; double result = 0; forEach(indices, [&](auto i) { - result += elementAt(c, i); + result += Dune::Hybrid::elementAt(c, i); }); return result; } diff --git a/dune/common/test/testsuite.hh b/dune/common/test/testsuite.hh index 370ff4c87e8fe57aa176a0ced6d19fa45fbe7377..dad1e62cb7eb103c5b52661c5ac5ae92b64943b5 100644 --- a/dune/common/test/testsuite.hh +++ b/dune/common/test/testsuite.hh @@ -123,7 +123,7 @@ namespace Dune { * * \returns False if any of the executed tests failed, otherwise true. */ - explicit operator const bool () const + explicit operator bool () const { return (failedChecks_==0); }