From d7a8084b4c6f50d019929894ac5b00c703304d66 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 22 May 2012 07:05:36 -0700 Subject: [PATCH] monmap: calc_ranks() on rename() This is simpler than ensuring we track all the right invariants. Signed-off-by: Sage Weil --- src/mon/MonMap.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 77f17b230b696..f2f6c6439c287 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -103,6 +103,14 @@ class MonMap { calc_ranks(); } + void rename(string oldname, string newname) { + assert(contains(oldname)); + assert(!contains(newname)); + mon_addr[newname] = mon_addr[oldname]; + mon_addr.erase(oldname); + calc_ranks(); + } + bool contains(const string& name) { return mon_addr.count(name); } @@ -147,14 +155,6 @@ class MonMap { return true; } - void rename(string oldname, string newname) { - assert(contains(oldname)); - assert(!contains(newname)); - mon_addr[newname] = mon_addr[oldname]; - mon_addr.erase(oldname); - addr_name[mon_addr[newname]] = newname; - } - const entity_addr_t& get_addr(const string& n) { assert(mon_addr.count(n)); return mon_addr[n]; -- 2.39.5