Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-24 14:23:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed some compilation bugs

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-12-17 23:19:05 +00:00
parent cfa2640ff8
commit 06f1f18e17
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/tests/ft/Makefile
View File

@ -10,7 +10,7 @@ OPS_TOP_DIR = ../../../../openpgpsdk/src
include $(RS_TOP_DIR)/tests/scripts/config.mk include $(RS_TOP_DIR)/tests/scripts/config.mk
############################################################### ###############################################################
TESTOBJ = ftfilemappertest.o ftfileprovidertest.o ftfilecreatortest.o ftextralisttest.o ftdataplextest.o fttransfermoduletest.o ftcrc32test.o ftcrossprovidercreatortest.o ftcontrollertest.o ftserver1test.o ftserver2test.o ftserver3test.o ftdata_test.o TESTOBJ = ftfilemappertest.o ftfileprovidertest.o ftfilecreatortest.o ftextralisttest.o ftdataplextest.o fttransfermoduletest.o ftcrc32test.o ftcrossprovidercreatortest.o ftcontrollertest.o ftserver1test.o ftserver2test.o ftserver3test.o ftdata_test.o ftsearch_test.o
TESTS = ftfileprovidertest ftfilecreatortest ftextralisttest ftdataplextest fttransfermoduletest ftcrc32test ftcrossprovidercreatortest ftcontrollertest ftserver1test ftserver2test fttransfermoduletest ftserver3test TESTS = ftfileprovidertest ftfilecreatortest ftextralisttest ftdataplextest fttransfermoduletest ftcrc32test ftcrossprovidercreatortest ftcontrollertest ftserver1test ftserver2test fttransfermoduletest ftserver3test
#ftfilemappertest #ftfilemappertest
@ -38,8 +38,8 @@ fttransfermoduletest : fttransfermoduletest.o
ftextralisttest : ftextralisttest.o ftextralisttest : ftextralisttest.o
$(CC) $(CFLAGS) -o ftextralisttest ftextralisttest.o $(LIBS) $(CC) $(CFLAGS) -o ftextralisttest ftextralisttest.o $(LIBS)
ftdataplextest : ftdataplextest.o ftdataplextest : ftdataplextest.o ftsearch_test.o ftdata_test.o
$(CC) $(CFLAGS) -o ftdataplextest ftdataplextest.o $(LIBS) $(CC) $(CFLAGS) -o ftdataplextest ftdata_test.o ftdataplextest.o ftsearch_test.o $(LIBS)
ftserver1test : ftserver1test.o ftserver1test : ftserver1test.o
$(CC) $(CFLAGS) -o ftserver1test ftserver1test.o $(LIBS) $(CC) $(CFLAGS) -o ftserver1test ftserver1test.o $(LIBS)

2
libretroshare/src/tests/ft/ftdata_test.cc
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "ft/ftdata.h" #include "ftdata_test.h"
/******* Pair of Send/Recv (Only need to handle Send side) ******/ /******* Pair of Send/Recv (Only need to handle Send side) ******/
ftDataSendPair::ftDataSendPair(ftDataRecv *recv) ftDataSendPair::ftDataSendPair(ftDataRecv *recv)

1
libretroshare/src/tests/ft/ftdataplextest.cc
View File

@ -41,6 +41,7 @@
#include "ft/ftfilesearch.h" #include "ft/ftfilesearch.h"
#include "ftdata_test.h" #include "ftdata_test.h"
#include "ftsearch_test.h"
void do_random_server_test(ftDataMultiplex *mplex, ftExtraList *eList, std::list<std::string> &files); void do_random_server_test(ftDataMultiplex *mplex, ftExtraList *eList, std::list<std::string> &files);

2
libretroshare/src/tests/ft/ftsearch_test.cc
View File

@ -1,6 +1,6 @@
#include "ftsearch_test.h" #include "ftsearch_test.h"
bool ftSearchDummy::search(std::string /*hash*/, FileSearchFlags hintflags, FileInfo &/*info*/) const bool ftSearchDummy::search(const std::string& /*hash*/, FileSearchFlags hintflags, FileInfo &/*info*/) const
{ {
/* remove unused parameter warnings */ /* remove unused parameter warnings */
(void) hintflags; (void) hintflags;