From 53eb4dfb1202f2dce0fe887007638d1c3cfff2a6 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 2 Jun 2016 21:21:18 -0400 Subject: [PATCH] fixed compilation errors due to last merge operation --- libretroshare/src/gxstunnel/rsgxstunnelitems.cc | 4 ++-- libretroshare/src/pqi/p3servicecontrol.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/gxstunnel/rsgxstunnelitems.cc b/libretroshare/src/gxstunnel/rsgxstunnelitems.cc index 553b708a0..2557e0028 100644 --- a/libretroshare/src/gxstunnel/rsgxstunnelitems.cc +++ b/libretroshare/src/gxstunnel/rsgxstunnelitems.cc @@ -373,7 +373,7 @@ RsGxsTunnelDHPublicKeyItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelDHPubl return item ; } -RsGxsTunnelDataItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelDataItem(void *dat,uint32_t /*size*/) +RsGxsTunnelDataItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelDataItem(void *dat,uint32_t size) { uint32_t offset = 8; // skip the header uint32_t rssize = getRsItemSize(dat); @@ -456,7 +456,7 @@ RsGxsTunnelDataAckItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelDataAckIte return item ; } -RsGxsTunnelStatusItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelStatusItem(void *dat, uint32_t /*size*/) +RsGxsTunnelStatusItem *RsGxsTunnelSerialiser::deserialise_RsGxsTunnelStatusItem(void *dat, uint32_t size) { uint32_t offset = 8; // skip the header uint32_t rssize = getRsItemSize(dat); diff --git a/libretroshare/src/pqi/p3servicecontrol.cc b/libretroshare/src/pqi/p3servicecontrol.cc index e465843dc..6f0545cb4 100644 --- a/libretroshare/src/pqi/p3servicecontrol.cc +++ b/libretroshare/src/pqi/p3servicecontrol.cc @@ -125,7 +125,7 @@ public: return ok; } - static RsServicePermissionItem *deserialise(uint8_t *data, uint32_t /*size*/) + static RsServicePermissionItem *deserialise(uint8_t *data, uint32_t size) { RsServicePermissionItem *item = new RsServicePermissionItem ;