From 2c8d047ca425497852a6e619371b2d6aeee71d43 Mon Sep 17 00:00:00 2001 From: Phenom Date: Thu, 2 Jun 2016 19:34:58 +0200 Subject: [PATCH] Fix UnitTests Compilation --- .../gxs/nxs_test/nxsdummyservices.cc | 5 ++--- .../gxs/nxs_test/nxsdummyservices.h | 16 +++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc index b72875020..38aa9f5d7 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc @@ -33,7 +33,7 @@ int rs_nxs_test::RsNxsSimpleDummyCircles::canReceive( return true; } -bool rs_nxs_test::RsNxsSimpleDummyCircles::isRecipient(const RsGxsCircleId &circleId, const RsGxsId& id) +bool rs_nxs_test::RsNxsSimpleDummyCircles::isRecipient(const RsGxsCircleId &circleId, const RsGxsGroupId &destination_group, const RsGxsId& id) { return true ; } @@ -43,8 +43,7 @@ bool rs_nxs_test::RsNxsSimpleDummyCircles::recipients( return true; } -bool rs_nxs_test::RsNxsSimpleDummyCircles::recipients( - const RsGxsCircleId& circleId, std::list& friendlist) { +bool rs_nxs_test::RsNxsSimpleDummyCircles::recipients(const RsGxsCircleId& circleId, const RsGxsGroupId &destination_group, std::list& friendlist) { return true; } rs_nxs_test::RsNxsSimpleDummyReputation::RsNxsSimpleDummyReputation( diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h index 4d3a78b1a..c8d43d944 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h @@ -41,11 +41,10 @@ namespace rs_nxs_test int canSend(const RsGxsCircleId &circleId, const RsPgpId &id,bool& should_encrypt); int canReceive(const RsGxsCircleId &circleId, const RsPgpId &id); - bool recipients(const RsGxsCircleId &circleId, std::list &friendlist); - - virtual bool recipients(const RsGxsCircleId &circleId, std::list& idlist) ; - virtual bool isRecipient(const RsGxsCircleId &circleId, const RsGxsId& id) ; - virtual bool getLocalCircleServerUpdateTS(const RsGxsCircleId& gid,time_t& grp_server_update_TS,time_t& msg_server_update_TS) { return true ; } + virtual bool recipients(const RsGxsCircleId &circleId, std::list &friendlist); + virtual bool recipients(const RsGxsCircleId &circleId, const RsGxsGroupId& destination_group, std::list& idlist) ; + virtual bool isRecipient(const RsGxsCircleId &circleId, const RsGxsGroupId& destination_group, const RsGxsId& id) ; + virtual bool getLocalCircleServerUpdateTS(const RsGxsCircleId& gid,time_t& grp_server_update_TS,time_t& msg_server_update_TS) { return true ; } }; /*! @@ -71,10 +70,9 @@ namespace rs_nxs_test int canSend(const RsGxsCircleId &circleId, const RsPgpId &id,bool& should_encrypt); int canReceive(const RsGxsCircleId &circleId, const RsPgpId &id); - bool recipients(const RsGxsCircleId &circleId, std::list &friendlist); - - virtual bool recipients(const RsGxsCircleId &circleId, std::list& idlist) { return true ;} - virtual bool isRecipient(const RsGxsCircleId &circleId, const RsGxsId& id) { return allowed(circleId) ; } + virtual bool recipients(const RsGxsCircleId &circleId, std::list &friendlist); + virtual bool recipients(const RsGxsCircleId &circleId, const RsGxsGroupId& destination_group, std::list& idlist) { return true ;} + virtual bool isRecipient(const RsGxsCircleId &circleId, const RsGxsGroupId& destination_group, const RsGxsId& id) { return allowed(circleId) ; } virtual bool getLocalCircleServerUpdateTS(const RsGxsCircleId& gid,time_t& grp_server_update_TS,time_t& msg_server_update_TS) { return true ; } private: