From c20284aebc8f5fbf99fed3d66042e5b81330ec7d Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Mon, 28 Feb 2011 19:24:50 +0100 Subject: [PATCH] diamond inheritance --- pvDataApp/monitor/monitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvDataApp/monitor/monitor.h b/pvDataApp/monitor/monitor.h index a5cf4eb..0ed7b68 100644 --- a/pvDataApp/monitor/monitor.h +++ b/pvDataApp/monitor/monitor.h @@ -69,7 +69,7 @@ namespace epics { namespace pvData { * Requester for ChannelMonitor. * @author mrk */ - class MonitorRequester : public Requester { + class MonitorRequester : public virtual Requester { public: /** * The client and server have both completed the createMonitor request.