diff --git a/dune/stuff/common/configuration.cc b/dune/stuff/common/configuration.cc index 3b817cc86461584dcf39b9b59b70aa32b3395e8e..86f31318eb87bd47f4dfc9bb2437a29fe9d704e2 100644 --- a/dune/stuff/common/configuration.cc +++ b/dune/stuff/common/configuration.cc @@ -90,7 +90,7 @@ Configuration::Configuration(const Dune::ParameterTree& tree_in, const bool reco setup_(); } -Configuration::Configuration(const ParameterTree& tree, const std::string sub_id) +Configuration::Configuration(const ParameterTree& tree_in, const std::string sub_id) : BaseType() , requests_map_() , record_defaults_(internal::configuration_record_defaults) @@ -99,7 +99,7 @@ Configuration::Configuration(const ParameterTree& tree, const std::string sub_id , logfile_(internal::configuration_logfile) { setup_(); - add(tree, sub_id); + add(tree_in, sub_id); } Configuration::Configuration(const Configuration& other) diff --git a/dune/stuff/common/configuration.hh b/dune/stuff/common/configuration.hh index ffa2db1379d8223b1205ce83b883974e339186b1..b0d1181dc56e75f350736c2bed14e1b9f3b1ab9b 100644 --- a/dune/stuff/common/configuration.hh +++ b/dune/stuff/common/configuration.hh @@ -115,7 +115,7 @@ public: const bool log_on_exit = internal::configuration_log_on_exit, const std::string logfile = internal::configuration_logfile); - explicit Configuration(const ParameterTree& tree, const std::string sub_id); + explicit Configuration(const ParameterTree& tree_in, const std::string sub_id); Configuration(const Configuration& other); diff --git a/dune/stuff/common/logstreams.cc b/dune/stuff/common/logstreams.cc index 38ed0650b2c7d37b6e47ebd216d053a762872cac..c99188d0c6ec3ce066c6fe879433ba43b0c8473f 100644 --- a/dune/stuff/common/logstreams.cc +++ b/dune/stuff/common/logstreams.cc @@ -136,8 +136,8 @@ LogStream& LogStream::flush() } -TimedPrefixedLogStream::TimedPrefixedLogStream(const Timer& timer, const std::string prefix, std::ostream& out) - : StorageBaseType(new TimedPrefixedStreamBuffer(timer, prefix, out)) +TimedPrefixedLogStream::TimedPrefixedLogStream(const Timer& timer, const std::string prefix, std::ostream& outstream) + : StorageBaseType(new TimedPrefixedStreamBuffer(timer, prefix, outstream)) , OstreamBaseType(&this->storage_access()) { } diff --git a/dune/stuff/common/logstreams.hh b/dune/stuff/common/logstreams.hh index d8c50f6bff57b6292cc5c5ff73b6bf14c0401d2b..87c9ddd7bc81bdee003cff58a997d3496524fde4 100644 --- a/dune/stuff/common/logstreams.hh +++ b/dune/stuff/common/logstreams.hh @@ -146,7 +146,7 @@ public: typedef SuspendableStrBuffer::PriorityType PriorityType; static const PriorityType default_suspend_priority = SuspendableStrBuffer::default_suspend_priority; - LogStream(SuspendableStrBuffer* buffer) + explicit LogStream(SuspendableStrBuffer* buffer) : StorageBaseType(buffer) , BaseType(&this->storage_access()) { @@ -211,7 +211,7 @@ class TimedPrefixedLogStream : StorageProvider<TimedPrefixedStreamBuffer>, typedef std::basic_ostream<char, std::char_traits<char>> OstreamBaseType; public: - TimedPrefixedLogStream(const Timer& timer, const std::string prefix, std::ostream& out); + TimedPrefixedLogStream(const Timer& timer, const std::string prefix, std::ostream& outstream); virtual ~TimedPrefixedLogStream(); }; // TimedPrefixedLogStream @@ -232,7 +232,7 @@ public: class EmptyLogStream : public LogStream { public: - EmptyLogStream(int& logflags) + explicit EmptyLogStream(int& logflags) : LogStream(new EmptyBuffer(int(LOG_NONE), logflags)) { }