From 739f926c4eb633a4fe21985bbb18a66c0e3fcf7d Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 2 Feb 2012 12:38:55 +0000
Subject: [PATCH] fix problems with previous commit
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7604 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/parameters.hh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index 4e706a4737..6910967414 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -304,7 +304,7 @@ private:
paramName = paramNameOrNil;
}
else {
- groupName = 0;
+ groupName = "";
paramName = groupOrParamName;
}
@@ -324,7 +324,7 @@ private:
// [Newton]
// WriteConvergence = true
std::string canonicalName(paramName);
- if (groupName && strlen(groupName) > 0) {
+ if (strlen(groupName) > 0) {
canonicalName.insert(0, ".");
canonicalName.insert(0, groupName);
}
@@ -371,7 +371,7 @@ private:
paramName = paramNameOrNil;
}
else {
- groupName = 0;
+ groupName = "";
paramName = groupOrParamName;
}
@@ -398,7 +398,7 @@ private:
//
// [Newton]
// WriteConvergence = true
- if (groupName && groupName[0] != '\0') {
+ if (strlen(groupName) > 0) {
canonicalName.append(groupName);
canonicalName.push_back('.');
}
--
GitLab