[Box Backup-commit] COMMIT r2099 - in box/trunk: bin/bbackupd lib/server

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-03-01 22:44:25 +0000 (Sat, 01 Mar 2008)
New Revision: 2099

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.h
   box/trunk/lib/server/Daemon.h
Log:
Workaround for (buggy?) gcc not finding inherited Main method on 
Windows.


Modified: box/trunk/bin/bbackupd/BackupDaemon.h
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.h	2008-03-01 22:37:04 UTC (rev 2098)
+++ box/trunk/bin/bbackupd/BackupDaemon.h	2008-03-01 22:44:25 UTC (rev 2099)
@@ -65,6 +65,14 @@
 		std::string GetOptionString();
 		int ProcessOption(signed int option);
 		int Main(const std::string &rConfigFileName);
+
+		// This shouldn't be here, but apparently gcc on
+		// Windows has no idea about inherited methods...
+		virtual int Main(const char *DefaultConfigFile, int argc,
+			const char *argv[])
+		{
+			return Daemon::Main(DefaultConfigFile, argc, argv);
+		}
 	#endif
 
 	void Run();

Modified: box/trunk/lib/server/Daemon.h
===================================================================
--- box/trunk/lib/server/Daemon.h	2008-03-01 22:37:04 UTC (rev 2098)
+++ box/trunk/lib/server/Daemon.h	2008-03-01 22:44:25 UTC (rev 2099)
@@ -40,7 +40,8 @@
 	Daemon(const Daemon &rToCopy);
 public:
 
-	int Main(const char *DefaultConfigFile, int argc, const char *argv[]);
+	virtual int Main(const char *DefaultConfigFile, int argc,
+		const char *argv[]);
 
 	/* override this Main() if you want custom option processing: */
 	virtual int Main(const std::string &rConfigFile);