ack
Another C++-ism that I'd repressed :-)
Thanks!
On Sat, Apr 16, 2011 at 4:27 PM, Russell Bryant
<russell(a)russellbryant.net> wrote:
The init() and invoke() functions are virtual. Mark them as such in
the
classes that derive from MatahariAgent to make that more clear. There
are no functional changes here.
Signed-off-by: Russell Bryant <russell(a)russellbryant.net>
---
src/host/matahari-host.cpp | 5 +++--
src/net/matahari-net.cpp | 5 +++--
src/service/matahari-srv.cpp | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/host/matahari-host.cpp b/src/host/matahari-host.cpp
index d405ded..7e42002 100644
--- a/src/host/matahari-host.cpp
+++ b/src/host/matahari-host.cpp
@@ -38,8 +38,9 @@ class HostAgent : public MatahariAgent
{
public:
int heartbeat();
- int setup(qmf::AgentSession session);
- gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data);
+ virtual int setup(qmf::AgentSession session);
+ virtual gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event,
+ gpointer user_data);
};
static gboolean heartbeat_timer(gpointer data)
diff --git a/src/net/matahari-net.cpp b/src/net/matahari-net.cpp
index 1cd02b7..87e8fee 100644
--- a/src/net/matahari-net.cpp
+++ b/src/net/matahari-net.cpp
@@ -47,8 +47,9 @@ extern "C" {
class NetAgent : public MatahariAgent
{
public:
- int setup(qmf::AgentSession session);
- gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data);
+ virtual int setup(qmf::AgentSession session);
+ virtual gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event,
+ gpointer user_data);
};
int
diff --git a/src/service/matahari-srv.cpp b/src/service/matahari-srv.cpp
index fc2b00f..426426c 100644
--- a/src/service/matahari-srv.cpp
+++ b/src/service/matahari-srv.cpp
@@ -50,8 +50,9 @@ class SrvAgent : public MatahariAgent
public:
void raiseEvent(svc_action_t *op, int service);
- int setup(qmf::AgentSession session);
- gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data);
+ virtual int setup(qmf::AgentSession session);
+ virtual gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event,
+ gpointer user_data);
};
--
1.7.4.4
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari