From f0ab38d8fb03cfd2b5b0d17fa5b3949d19340f04 Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Thu, 6 Aug 2015 13:58:17 +0200
Subject: [PATCH] fixes a couple of warnings
---
dune/stuff/functions/expression.hh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/stuff/functions/expression.hh b/dune/stuff/functions/expression.hh
index ed67d39f6..ebfd6c2b1 100644
--- a/dune/stuff/functions/expression.hh
+++ b/dune/stuff/functions/expression.hh
@@ -214,24 +214,24 @@ public:
#ifndef NDEBUG
#ifndef DUNE_STUFF_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
bool failure = false;
- std::string type;
+ std::string error_type;
for (size_t rr = 0; rr < dimRange; ++rr) {
tmp_row_ = ret[rr];
for (size_t cc = 0; cc < dimRangeCols; ++cc) {
if (DSC::isnan(tmp_row_[cc])) {
- failure = true;
- type = "NaN";
+ failure = true;
+ error_type = "NaN";
} else if (DSC::isinf(tmp_row_[cc])) {
- failure = true;
- type = "inf";
+ failure = true;
+ error_type = "inf";
} else if (std::abs(tmp_row_[cc]) > (0.9 * std::numeric_limits<double>::max())) {
- failure = true;
- type = "an unlikely value";
+ failure = true;
+ error_type = "an unlikely value";
}
if (failure)
DUNE_THROW(Stuff::Exceptions::internal_error,
"evaluating this function yielded "
- << type
+ << error_type
<< "!\n"
<< "The variable of this function is: "
<< function_->variable()
--
GitLab