From 7ffba173a09f1b9fd6dea36500f702e7b17bf21d Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Sun, 24 Jan 2016 00:14:33 +0100
Subject: [PATCH] [BL] removed default arg
---
BaseLib/ConfigTreeNew.cpp | 4 ++--
BaseLib/ConfigTreeNew.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/BaseLib/ConfigTreeNew.cpp b/BaseLib/ConfigTreeNew.cpp
index 8d461e2233a..1943d1baa4a 100644
--- a/BaseLib/ConfigTreeNew.cpp
+++ b/BaseLib/ConfigTreeNew.cpp
@@ -298,10 +298,10 @@ ConfigTreeNew::checkAndInvalidate()
for (auto const& p : _visited_params)
{
- auto const& tag = std::get<1>(p.first);
+ auto const& tag = p.first.second;
auto const& count = p.second.count;
- if (std::get<0>(p.first)) { // tag
+ if (p.first.first) { // tag
if (count > 0) {
warning("XML attribute \"" + tag + "\" has been read " + std::to_string(count)
+ " time(s) more than it was present in the configuration tree.");
diff --git a/BaseLib/ConfigTreeNew.h b/BaseLib/ConfigTreeNew.h
index f96c476ecad..291ea5f16e0 100644
--- a/BaseLib/ConfigTreeNew.h
+++ b/BaseLib/ConfigTreeNew.h
@@ -147,7 +147,7 @@ public:
// tell the _parent instance that a setting now has been parsed.
if (_has_incremented) {
_has_incremented = false;
- _parent.markVisited<ValueType>(_tagname, false);
+ _parent.markVisited<ValueType>(_tagname, false, false);
}
return ConfigTreeNew(_it->second, _parent, _tagname).getValue<ValueType>();
}
@@ -384,7 +384,7 @@ private:
*/
template<typename T>
CountType& markVisited(std::string const& key, bool const is_attr,
- bool peek_only = false) const;
+ bool peek_only) const;
/*! Keeps track of the key \c key and its value type ConfigTree.
*
@@ -392,7 +392,7 @@ private:
*
* \c param peek_only if true, do not change the read-count of the given key.
*/
- CountType& markVisited(std::string const& key, bool const peek_only = false) const;
+ CountType& markVisited(std::string const& key, bool const peek_only) const;
//! Used in the destructor to compute the difference between number of reads of a parameter
//! and the number of times it exists in the ConfigTree
--
GitLab