From 06f1f18e177b813f6bf7070deabcafb1971c2e7e Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Mon, 17 Dec 2012 23:19:05 +0000
Subject: [PATCH] fixed some compilation bugs

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/tests/ft/Makefile          | 6 +++---
 libretroshare/src/tests/ft/ftdata_test.cc    | 2 +-
 libretroshare/src/tests/ft/ftdataplextest.cc | 1 +
 libretroshare/src/tests/ft/ftsearch_test.cc  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libretroshare/src/tests/ft/Makefile b/libretroshare/src/tests/ft/Makefile
index 4e0baffa1..3588da057 100644
--- a/libretroshare/src/tests/ft/Makefile
+++ b/libretroshare/src/tests/ft/Makefile
@@ -10,7 +10,7 @@ OPS_TOP_DIR = ../../../../openpgpsdk/src
 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
 #ftfilemappertest 
@@ -38,8 +38,8 @@ fttransfermoduletest : fttransfermoduletest.o
 ftextralisttest : ftextralisttest.o 
 	$(CC) $(CFLAGS) -o ftextralisttest ftextralisttest.o $(LIBS)
 
-ftdataplextest : ftdataplextest.o 
-	$(CC) $(CFLAGS) -o ftdataplextest ftdataplextest.o $(LIBS)
+ftdataplextest : ftdataplextest.o ftsearch_test.o ftdata_test.o
+	$(CC) $(CFLAGS) -o ftdataplextest  ftdata_test.o ftdataplextest.o ftsearch_test.o $(LIBS)
 
 ftserver1test : ftserver1test.o 
 	$(CC) $(CFLAGS) -o ftserver1test ftserver1test.o $(LIBS)
diff --git a/libretroshare/src/tests/ft/ftdata_test.cc b/libretroshare/src/tests/ft/ftdata_test.cc
index 6fdd42d02..9e757c4f6 100644
--- a/libretroshare/src/tests/ft/ftdata_test.cc
+++ b/libretroshare/src/tests/ft/ftdata_test.cc
@@ -23,7 +23,7 @@
  *
  */
 
-#include "ft/ftdata.h"
+#include "ftdata_test.h"
 
 /******* Pair of Send/Recv (Only need to handle Send side) ******/
 ftDataSendPair::ftDataSendPair(ftDataRecv *recv)
diff --git a/libretroshare/src/tests/ft/ftdataplextest.cc b/libretroshare/src/tests/ft/ftdataplextest.cc
index bfa5464c6..bbddbfaf9 100644
--- a/libretroshare/src/tests/ft/ftdataplextest.cc
+++ b/libretroshare/src/tests/ft/ftdataplextest.cc
@@ -41,6 +41,7 @@
 #include "ft/ftfilesearch.h"
 
 #include "ftdata_test.h"
+#include "ftsearch_test.h"
 
 void	do_random_server_test(ftDataMultiplex *mplex, ftExtraList *eList, std::list<std::string> &files);
 
diff --git a/libretroshare/src/tests/ft/ftsearch_test.cc b/libretroshare/src/tests/ft/ftsearch_test.cc
index 5803a7428..f80670c37 100644
--- a/libretroshare/src/tests/ft/ftsearch_test.cc
+++ b/libretroshare/src/tests/ft/ftsearch_test.cc
@@ -1,6 +1,6 @@
 #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 */
 	(void) hintflags;