From 3cfa66a9a2a9d28f13cc570e17c0b9d61dbc8832 Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Tue, 6 Jul 2010 21:30:10 +0000 Subject: [PATCH] made method signature consistent with lib/cc/session.h. I believe this is sufficiently trivial, so committing it without an explicit review. git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@2419 e5f2f494-b856-4b98-b285-d166d9295462 --- src/lib/config/tests/fake_session.cc | 7 +++---- src/lib/config/tests/fake_session.h | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/lib/config/tests/fake_session.cc b/src/lib/config/tests/fake_session.cc index c88c29d871..ab5da60734 100644 --- a/src/lib/config/tests/fake_session.cc +++ b/src/lib/config/tests/fake_session.cc @@ -90,8 +90,7 @@ getFirstMessage(std::string& group, std::string& to) } void -addMessage(ElementPtr msg, const std::string& group, const std::string& to) -{ +addMessage(ElementPtr msg, const std::string& group, const std::string& to) { ElementPtr m_el = Element::createList(); m_el->add(Element::create(group)); m_el->add(Element::create(to)); @@ -247,7 +246,7 @@ Session::unsubscribe(std::string group, std::string instance) { listRemove(subscriptions, s_el); } -unsigned int +int Session::group_sendmsg(ElementPtr msg, std::string group, std::string to, std::string instance UNUSED_PARAM) { @@ -264,7 +263,7 @@ Session::group_recvmsg(ElementPtr& envelope, ElementPtr& msg, return (recvmsg(envelope, msg, nonblock, seq)); } -unsigned int +int Session::reply(ElementPtr& envelope, ElementPtr& newmsg) { //cout << "[XX] client sends reply: " << newmsg << endl; //cout << "[XX] env: " << envelope << endl; diff --git a/src/lib/config/tests/fake_session.h b/src/lib/config/tests/fake_session.h index 195c266178..d1d0d65d5a 100644 --- a/src/lib/config/tests/fake_session.h +++ b/src/lib/config/tests/fake_session.h @@ -86,16 +86,16 @@ namespace isc { std::string instance = "*"); void unsubscribe(std::string group, std::string instance = "*"); - unsigned int group_sendmsg(isc::data::ElementPtr msg, - std::string group, - std::string instance = "*", - std::string to = "*"); + int group_sendmsg(isc::data::ElementPtr msg, + std::string group, + std::string instance = "*", + std::string to = "*"); bool group_recvmsg(isc::data::ElementPtr& envelope, isc::data::ElementPtr& msg, bool nonblock = true, int seq = -1); - unsigned int reply(isc::data::ElementPtr& envelope, - isc::data::ElementPtr& newmsg); + int reply(isc::data::ElementPtr& envelope, + isc::data::ElementPtr& newmsg); bool hasQueuedMsgs(); };