From 5213992f807b3fe80631cfe4f363455c5ed7f385 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Mon, 15 Jan 2018 11:56:56 +0100
Subject: [PATCH] added 'using namespace' inside generic lambdas to workaround
an intel compiler bug
---
dune/common/test/hybridutilitiestest.cc | 6 +++---
dune/common/test/testsuite.hh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/common/test/hybridutilitiestest.cc b/dune/common/test/hybridutilitiestest.cc
index c6607e8d4..77d1ee31d 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 370ff4c87..dad1e62cb 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);
}
--
GitLab