Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-24 23:19:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

A couple of fixes to make TLV compile.

Browse Source 
added tlvconfig_test to regressions.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@264 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2007-11-22 02:28:28 +00:00
parent 7da0e9b3f3
commit 8f63b77a57
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretroshare/src/serialiser/Makefile
View File

@ -11,10 +11,10 @@ RSOBJ = rsserial.o rsbaseserial.o rstlvbase.o rstlvtypes.o rsbaseitems.o
RSOBJ += rstlvfileitem.o rstlvutil.o
TESTOBJ = tlvbase_test.o tlvbase_test2.o tlvfileitem_test.o
TESTOBJ += tlvitems_test.o tlvstack_test.o
TESTOBJ += tlvitems_test.o tlvstack_test.o tlvconfig_test.o
TESTS = tlvbase_test tlvbase_test2 tlvfileitem_test
TESTS += tlvitems_test tlvstack_test
TESTS += tlvitems_test tlvstack_test tlvconfig_test
all: librs tests
@ -33,6 +33,11 @@ tlvitems_test : tlvitems_test.o
tlvstack_test : tlvstack_test.o
$(CC) $(CFLAGS) -o tlvstack_test tlvstack_test.o $(OBJ) $(LIBS)
tlvconfig_test : tlvconfig_test.o
$(CC) $(CFLAGS) -o tlvconfig_test tlvconfig_test.o $(OBJ) $(LIBS)
###############################################################

1
libretroshare/src/serialiser/rstlvbase.h
View File

@ -78,6 +78,7 @@ const uint16_t TLV_TYPE_UINT32_SIZE = 0x0010;
const uint16_t TLV_TYPE_UINT32_POP = 0x0011;
const uint16_t TLV_TYPE_UINT32_AGE = 0x0012;
const uint16_t TLV_TYPE_UINT32_OFFSET = 0x0013;
const uint16_t TLV_TYPE_UINT32_SERID = 0x0014;
const uint16_t TLV_TYPE_STR_HASH = 0x0020;
const uint16_t TLV_TYPE_STR_NAME = 0x0021;

2
libretroshare/src/serialiser/rstlvtypes.h
View File

@ -156,7 +156,7 @@ virtual bool SetTlv(void *data, uint32_t size, uint32_t *offset); /* seriali
virtual bool GetTlv(void *data, uint32_t size, uint32_t *offset); /* deserialise */
virtual std::ostream &print(std::ostream &out, uint16_t indent);
std::list<uint8_t> ids; /* Mandatory */
std::list<uint32_t> ids; /* Mandatory */
};

6
libretroshare/src/serialiser/tlvconfig_test.cc
View File

@ -7,9 +7,9 @@
#include <iostream>
#include <sstream>
#include "rstlvtypes.h"
#include "rstlvutil.h"
#include "utest.h"
#include "serialiser/rstlvtypes.h"
#include "serialiser/rstlvutil.h"
#include "util/utest.h"
INITTEST();