Fixed some cross platform issues.

SimpleDemo.cpp

@@ -28,7 +28,6 @@
 
 #include <FileWatcher/FileWatcher.h>
 #include <iostream>
-#include <conio.h>
 
 /// Processes a file action
 class UpdateListener : public FW::FileWatchListener
@@ -50,24 +49,17 @@ int main(int argc, char **argv)
 		// create the file watcher object
 		FW::FileWatcher fileWatcher;
 
-		// create an instance of UpdateListener on the stack
-		UpdateListener updateListener;
-
 		// add a watch to the system
-		FW::WatchID watchID = fileWatcher.addWatch("./test", &updateListener);
+		FW::WatchID watchID = fileWatcher.addWatch("./test", new UpdateListener());
 
-		std::cout << "Press <enter> to exit demo" << std::endl;
+		std::cout << "Press ^C to exit demo" << std::endl;
 
 		// loop until a key is pressed
-		while(!_kbhit())
+		while(1)
 		{
 			fileWatcher.update();
 		}
-		std::cin.ignore();
-
-		// now remove the watch, otherwise FileWatcher will mistake updateListener
-		// for something that should be cleaned up.
-		fileWatcher.removeWatch(watchID);
+kj
 	} 
 	catch( std::exception& e ) 
 	{

includes/FileWatcher/FileWatcher.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include <string>
+#include <stdexcept>
 
 namespace FW
 {

includes/FileWatcher/FileWatcherLinux.h

@@ -39,7 +39,7 @@ namespace FW
 {
 	/// Implementation for Linux based on inotify.
 	/// @class FileWatcherLinux
-	class FileWatcherLinux
+	class FileWatcherLinux : public FileWatcherImpl
 	{
 	public:
 		/// type for a map from WatchID to WatchStruct pointer

includes/FileWatcher/FileWatcherOSX.h

@@ -39,7 +39,7 @@ namespace FW
 {
 	/// Implementation for OSX based on kqueue.
 	/// @class FileWatcherOSX
-	class FileWatcherOSX
+	class FileWatcherOSX : public FileWatcherImpl
 	{
 	public:
 		/// type for a map from WatchID to WatchStruct pointer

source/FileWatcher.cpp

@@ -21,6 +21,7 @@
 */
 
 #include <FileWatcher/FileWatcher.h>
+#include <FileWatcher/FileWatcherImpl.h>
 
 #if FILEWATCHER_PLATFORM == FILEWATCHER_PLATFORM_WIN32
 #	include <FileWatcher/FileWatcherWin32.h>