[sword-svn] r1705 - trunk/include

[jansorg at crosswire.org]

Author: jansorg
Date: 2005-01-29 18:19:35 -0700 (Sat, 29 Jan 2005)
New Revision: 1705

Modified:
   trunk/include/ftptrans.h
Log:
remove the external_c part out of the namespace, this confuses the compiler

Modified: trunk/include/ftptrans.h
===================================================================
--- trunk/include/ftptrans.h	2005-01-30 00:28:03 UTC (rev 1704)
+++ trunk/include/ftptrans.h	2005-01-30 01:19:35 UTC (rev 1705)
@@ -4,7 +4,7 @@
 #include <vector>
 #include <defs.h>
 
-SWORD_NAMESPACE_START
+//SWORD_NAMESPACE_START
 
 
 // move this include to cpp once struct ftpparse isn't exposed anymore
@@ -12,6 +12,8 @@
 #include <ftpparse.h>
 }
 
+SWORD_NAMESPACE_START
+
 //class for reporting status
 class StatusReporter {
 public:
@@ -32,7 +34,7 @@
 	
 public:
 	FTPTransport(const char *host, StatusReporter *statusReporter = 0);
-	~FTPTransport();
+	virtual ~FTPTransport();
 	virtual char getURL(const char *destPath, const char *sourceURL);
 
 	int copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix);
@@ -41,7 +43,7 @@
 	// own FTPFile class or something that contains things like file name,
 	// size, type (dir, file, special).  Then change to vector of this class
 	// instead of ftpparse
-	std::vector<struct ftpparse> getDirList(const char *dirURL);
+	virtual std::vector<struct ftpparse> getDirList(const char *dirURL);
 	void setPassive(bool passive) { this->passive = passive; }
 	void terminate() { term = true; }
 };