From 9d573b06d96f95c840c63e18a0d804ba9764885c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Fritze?= <rene.fritze@wwu.de>
Date: Tue, 11 Aug 2020 08:22:45 +0200
Subject: [PATCH] [common] fixes typing for a few string args
generally these should either be non-const value or const ref
---
dune/xt/common/configuration.cc | 4 ++--
dune/xt/common/configuration.hh | 4 ++--
dune/xt/common/timedlogging.cc | 8 ++++----
dune/xt/common/timedlogging.hh | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dune/xt/common/configuration.cc b/dune/xt/common/configuration.cc
index 1c2296dd1..5254ad12c 100644
--- a/dune/xt/common/configuration.cc
+++ b/dune/xt/common/configuration.cc
@@ -126,7 +126,7 @@ bool Configuration::has_key(const std::string& key) const
return BaseType::hasKey(key);
}
-Configuration Configuration::sub(const std::string sub_id, bool fail_if_missing, Configuration default_value) const
+Configuration Configuration::sub(const std::string& sub_id, bool fail_if_missing, Configuration default_value) const
{
if ((empty() || !has_sub(sub_id)) && !fail_if_missing)
return default_value;
@@ -146,7 +146,7 @@ Configuration Configuration::sub(const std::string sub_id, bool fail_if_missing,
return Configuration(BaseType::sub(sub_id));
} // ... sub(...)
-bool Configuration::has_sub(const std::string subTreeName) const
+bool Configuration::has_sub(const std::string& subTreeName) const
{
return BaseType::hasSub(subTreeName);
}
diff --git a/dune/xt/common/configuration.hh b/dune/xt/common/configuration.hh
index b2db3b92e..e71dcf44d 100644
--- a/dune/xt/common/configuration.hh
+++ b/dune/xt/common/configuration.hh
@@ -124,7 +124,7 @@ some_function_which_expects_a_config({{"type", "custom"}, {"tolerance", "1e-10"}
bool has_key(const std::string& key) const;
//! check if sub is existing in tree_
- bool has_sub(const std::string subTreeName) const;
+ bool has_sub(const std::string& subTreeName) const;
/** \brief print the ParameterTree
* \param out output stream
@@ -136,7 +136,7 @@ some_function_which_expects_a_config({{"type", "custom"}, {"tolerance", "1e-10"}
* @attention Please note the difference to Dune::ParameterTree::sub (return: value vs. reference)!
*/
Configuration
- sub(const std::string sub_id, bool fail_if_missing = true, Configuration default_value = Configuration()) const;
+ sub(const std::string& sub_id, bool fail_if_missing = true, Configuration default_value = Configuration()) const;
/**
* \}
diff --git a/dune/xt/common/timedlogging.cc b/dune/xt/common/timedlogging.cc
index e1245eb3d..096f9aa64 100644
--- a/dune/xt/common/timedlogging.cc
+++ b/dune/xt/common/timedlogging.cc
@@ -206,9 +206,9 @@ void TimedLogging::create(const ssize_t max_info_level,
const ssize_t max_debug_level,
const bool enable_warnings,
const bool enable_colors,
- const std::string info_color,
- const std::string debug_color,
- const std::string warning_color)
+ const std::string& info_color,
+ const std::string& debug_color,
+ const std::string& warning_color)
{
DUNE_UNUSED std::lock_guard<std::mutex> guard(mutex_);
DUNE_THROW_IF(created_, Exceptions::logger_error, "Do not call create() more than once!");
@@ -224,7 +224,7 @@ void TimedLogging::create(const ssize_t max_info_level,
update_colors();
} // ... create(...)
-TimedLogManager TimedLogging::get(const std::string id)
+TimedLogManager TimedLogging::get(const std::string& id)
{
DUNE_UNUSED std::lock_guard<std::mutex> guard(mutex_);
++current_level_;
diff --git a/dune/xt/common/timedlogging.hh b/dune/xt/common/timedlogging.hh
index 840a9b3d5..9e7c214a7 100644
--- a/dune/xt/common/timedlogging.hh
+++ b/dune/xt/common/timedlogging.hh
@@ -228,7 +228,7 @@ public:
/**
* \brief sets the state
*
- * This methos is mainly intended to be used on the global TimedLogger() instance. Before calling this method
+ * This method is mainly intended to be used on the global TimedLogger() instance. Before calling this method
* the state is set according to the defaults default_max_info_level, default_max_debug_level and
* default_enable_warnings.
* \note Calling this method more than once will throw an Exceptions::you_are_using_this_wrong, following the idea of
@@ -238,11 +238,11 @@ public:
const ssize_t max_debug_level = default_max_debug_level,
const bool enable_warnings = default_enable_warnings,
const bool enable_colors = default_enable_colors,
- const std::string info_color = default_info_color(),
- const std::string debug_color = default_debug_color(),
- const std::string warning_color = default_warning_color());
+ const std::string& info_color = default_info_color(),
+ const std::string& debug_color = default_debug_color(),
+ const std::string& warning_color = default_warning_color());
- TimedLogManager get(const std::string id);
+ TimedLogManager get(const std::string& id);
private:
void update_colors();
--
GitLab