From eabefa1d8f86816375fb9f957b66bebd196ca98c Mon Sep 17 00:00:00 2001 From: Markus Blatt <mblatt@dune-project.org> Date: Mon, 25 Jun 2012 10:00:58 +0000 Subject: [PATCH] Avoid -Wshadow warning in dune/common/exceptions Patch contributed by Matthias Wohlmuth [[Imported from SVN: r6816]] --- dune/common/exceptions.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dune/common/exceptions.hh b/dune/common/exceptions.hh index a227e7c9d..5fd416186 100644 --- a/dune/common/exceptions.hh +++ b/dune/common/exceptions.hh @@ -92,7 +92,7 @@ namespace Dune { class Exception { public: Exception (); - void message(const std::string &message); //!< store string in internal message buffer + void message(const std::string &msg); //!< store string in internal message buffer const std::string& what() const; //!< output internal message buffer static void registerHook (ExceptionHook * hook); //!< add a functor which is called before a Dune::Exception is emitted (see Dune::ExceptionHook) \see Dune::ExceptionHook static void clearHook (); //!< remove all hooks @@ -192,9 +192,9 @@ namespace Dune { _hook = 0; } - inline void Exception::message(const std::string &message) + inline void Exception::message(const std::string & msg) { - _message = message; + _message = msg; } inline const std::string& Exception::what() const -- GitLab