From c0ab63e7b3df511f79ccc8b1dec520d7836209eb Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 14 Feb 2012 17:53:28 -0800 Subject: [PATCH] mon: constify functions needed to use dout from a const function Signed-off-by: Josh Durgin --- src/mon/Monitor.cc | 2 +- src/mon/Monitor.h | 2 +- src/mon/PGMonitor.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index d1532f3107956..3cfc46ade0866 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -73,7 +73,7 @@ #define DOUT_SUBSYS mon #undef dout_prefix #define dout_prefix _prefix(_dout, this) -static ostream& _prefix(std::ostream *_dout, Monitor *mon) { +static ostream& _prefix(std::ostream *_dout, const Monitor *mon) { return *_dout << "mon." << mon->name << "@" << mon->rank << "(" << mon->get_state_name() << ") e" << mon->monmap->get_epoch() << " "; } diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 6d0ed691c39db..8147a8ccbb5ca 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -145,7 +145,7 @@ public: default: return "???"; } } - const char *get_state_name() { + const char *get_state_name() const { return get_state_name(state); } diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index e2fb70621a428..6016e9e8a4d44 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -44,7 +44,7 @@ #define DOUT_SUBSYS mon #undef dout_prefix #define dout_prefix _prefix(_dout, mon, pg_map) -static ostream& _prefix(std::ostream *_dout, Monitor *mon, PGMap& pg_map) { +static ostream& _prefix(std::ostream *_dout, const Monitor *mon, const PGMap& pg_map) { return *_dout << "mon." << mon->name << "@" << mon->rank << "(" << mon->get_state_name() << ").pg v" << pg_map.version << " "; -- 2.47.3