Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate TLV items, to avoid temptation to use them in new code

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-11-10 16:28:15 +01:00
parent f84824271f
commit 72dd985162
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/serialiser/rstlvidset.h
View File

@ -28,13 +28,15 @@
#include "serialiser/rstlvbase.h" #include "serialiser/rstlvbase.h"
#include "serialiser/rstlvitem.h" #include "serialiser/rstlvitem.h"
#include "util/rsdeprecate.h"
#include <retroshare/rstypes.h> #include <retroshare/rstypes.h>
#include <retroshare/rsgxsifacetypes.h> #include <retroshare/rsgxsifacetypes.h>
#include <list> #include <list>
template<class ID_CLASS,uint32_t TLV_TYPE> class t_RsTlvIdSet: public RsTlvItem /// @deprecated use plain std::set<> instead
template<class ID_CLASS,uint32_t TLV_TYPE> class RS_DEPRECATED_FOR(std::set<>) t_RsTlvIdSet
: public RsTlvItem
{ {
public: public:
t_RsTlvIdSet() {} t_RsTlvIdSet() {}
@ -122,7 +124,7 @@ typedef t_RsTlvIdSet<RsGxsMessageId,TLV_TYPE_GXSMSGIDSET> RsTlvGxsMsgIdSet
typedef t_RsTlvIdSet<RsGxsCircleId, TLV_TYPE_GXSCIRCLEIDSET> RsTlvGxsCircleIdSet ; typedef t_RsTlvIdSet<RsGxsCircleId, TLV_TYPE_GXSCIRCLEIDSET> RsTlvGxsCircleIdSet ;
typedef t_RsTlvIdSet<RsNodeGroupId, TLV_TYPE_NODEGROUPIDSET> RsTlvNodeGroupIdSet ; typedef t_RsTlvIdSet<RsNodeGroupId, TLV_TYPE_NODEGROUPIDSET> RsTlvNodeGroupIdSet ;
class RsTlvServiceIdSet: public RsTlvItem class RS_DEPRECATED RsTlvServiceIdSet: public RsTlvItem
{ {
public: public:
RsTlvServiceIdSet() { return; } RsTlvServiceIdSet() { return; }

16
libretroshare/src/serialiser/rstlvitem.h
View File

@ -26,15 +26,18 @@
* *
******************************************************************/ ******************************************************************/
#include "util/rsdeprecate.h"
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>
#include <inttypes.h> #include <inttypes.h>
//! A base class for all tlv items /*! A base class for all tlv items
/*! This class is provided to allow the serialisation and deserialization of compund * This class is provided to allow the serialisation and deserialization of
tlv items * compund tlv items
*/ * @deprecated TLV serialization system is deprecated!
class RsTlvItem */
class RS_DEPRECATED_FOR(RsSerializable) RsTlvItem
{ {
public: public:
RsTlvItem() { return; } RsTlvItem() { return; }
@ -51,8 +54,7 @@ std::ostream &printEnd(std::ostream &out, std::string clsName, uint16_t indent)
std::ostream &printIndent(std::ostream &out, uint16_t indent); std::ostream &printIndent(std::ostream &out, uint16_t indent);
class RS_DEPRECATED_FOR(RsSerializable) RsTlvUnit: public RsTlvItem
class RsTlvUnit: public RsTlvItem
{ {
public: public:
RsTlvUnit(uint16_t tlv_type); RsTlvUnit(uint16_t tlv_type);