From f78d3d0a5ca926525f94940c3103d4f08c03b894 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 14 Jan 2010 16:06:17 -0800 Subject: [PATCH] msgr: fix mark_down Beware non-pure virtual methods in the abstract interface! --- src/msg/Messenger.h | 2 +- src/msg/SimpleMessenger.cc | 2 +- src/msg/SimpleMessenger.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index 6f091b8427d52..f8df14e7f4540 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -154,7 +154,7 @@ protected: } virtual int send_keepalive(const entity_inst_t& dest) = 0; - virtual void mark_down(const entity_addr_t& a) {} + virtual void mark_down(const entity_addr_t& a) = 0; protected: //destruction should be handled via destroy() diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index c229f1942af86..8ba928df3298b 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -2377,7 +2377,7 @@ void SimpleMessenger::wait() -void SimpleMessenger::mark_down(entity_addr_t addr) +void SimpleMessenger::mark_down(const entity_addr_t& addr) { lock.Lock(); if (rank_pipe.count(addr)) { diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h index 5e5c41aef90ad..ca1c8975c069a 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -422,7 +422,7 @@ private: const entity_addr_t &get_ms_addr() { return ms_addr; } - void mark_down(entity_addr_t addr); + void mark_down(const entity_addr_t& addr); void reaper(); -- 2.39.5