From 82bd8d5f6afbc1713cbb42f82482809702c874fd Mon Sep 17 00:00:00 2001 From: Phenom Date: Tue, 8 Dec 2020 09:48:26 +0100 Subject: [PATCH] Fix CONFIG with rs_deep_channels_index --- libretroshare/src/gxs/rsgxsutil.cc | 16 ++++++++++++---- libretroshare/src/gxs/rsgxsutil.h | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libretroshare/src/gxs/rsgxsutil.cc b/libretroshare/src/gxs/rsgxsutil.cc index c907ceb22..aef882816 100644 --- a/libretroshare/src/gxs/rsgxsutil.cc +++ b/libretroshare/src/gxs/rsgxsutil.cc @@ -207,16 +207,24 @@ RsGxsIntegrityCheck::RsGxsIntegrityCheck( void RsGxsIntegrityCheck::run() { - std::vector grps_to_delete; - GxsMsgReq msgs_to_delete; + std::vector grps_to_delete; + GxsMsgReq msgs_to_delete; - check(mGenExchangeClient->serviceType(),mGixs,mDs,mDeletedGrps,mDeletedMsgs); + check(mGenExchangeClient->serviceType(), mGixs, mDs +#ifdef RS_DEEP_CHANNEL_INDEX + , mGenExchangeClient, mSerializer +#endif + , mDeletedGrps, mDeletedMsgs); RS_STACK_MUTEX(mIntegrityMutex); mDone = true; } -bool RsGxsIntegrityCheck::check(uint16_t service_type, RsGixs *mgixs, RsGeneralDataService *mds, std::vector& grpsToDel, GxsMsgReq& msgsToDel) +bool RsGxsIntegrityCheck::check(uint16_t service_type, RsGixs *mgixs, RsGeneralDataService *mds +#ifdef RS_DEEP_CHANNEL_INDEX + , RsGenExchange* mGenExchangeClient, RsSerialType& mSerializer +#endif + , std::vector& grpsToDel, GxsMsgReq& msgsToDel) { #ifdef RS_DEEP_CHANNEL_INDEX bool isGxsChannels = mGenExchangeClient->serviceType() == RS_SERVICE_GXS_TYPE_CHANNELS; diff --git a/libretroshare/src/gxs/rsgxsutil.h b/libretroshare/src/gxs/rsgxsutil.h index ff2a0e20c..e761ff7c1 100644 --- a/libretroshare/src/gxs/rsgxsutil.h +++ b/libretroshare/src/gxs/rsgxsutil.h @@ -175,7 +175,11 @@ public: RsGenExchange *genex, RsSerialType& gxsSerialiser, RsGixs *gixs); - static bool check(uint16_t service_type, RsGixs *mgixs, RsGeneralDataService *mds, std::vector& grpsToDel, GxsMsgReq& msgsToDel); + static bool check(uint16_t service_type, RsGixs *mgixs, RsGeneralDataService *mds +#ifdef RS_DEEP_CHANNEL_INDEX + , RsGenExchange* mGenExchangeClient, RsSerialType& mSerializer +#endif + , std::vector& grpsToDel, GxsMsgReq& msgsToDel); bool isDone(); void run();