Updated efsw. Fixed issue #204.

1 files changed, 71 insertions, 70 deletions

diff --git a/src/3rdParty/efsw/FileWatcherWin32.hpp b/src/3rdParty/efsw/FileWatcherWin32.hpp
index 94439cf..3016aac 100755..100644
--- a/src/3rdParty/efsw/FileWatcherWin32.hpp
+++ b/src/3rdParty/efsw/FileWatcherWin32.hpp
@@ -1,70 +1,71 @@
-#ifndef EFSW_FILEWATCHERWIN32_HPP
-#define EFSW_FILEWATCHERWIN32_HPP
-
-#include <efsw/base.hpp>
-
-#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
-
-#include <efsw/WatcherWin32.hpp>
-#include <map>
-#include <set>
-#include <vector>
-
-namespace efsw {
-
-/// Implementation for Win32 based on ReadDirectoryChangesW.
-/// @class FileWatcherWin32
-class FileWatcherWin32 : public FileWatcherImpl {
-  public:
-        /// type for a map from WatchID to WatcherWin32 pointer
-        typedef std::set<WatcherStructWin32*> Watches;
-
-        FileWatcherWin32( FileWatcher* parent );
-
-        virtual ~FileWatcherWin32();
-
-        /// Add a directory watch
-        /// On error returns WatchID with Error type.
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
-
-        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
-        void removeWatch( const std::string& directory );
-
-        /// Remove a directory watch. This is a map lookup O(logn).
-        void removeWatch( WatchID watchid );
-
-        /// Updates the watcher. Must be called often.
-        void watch();
-
-        /// Handles the action
-        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
-                                           std::string oldFilename = "" );
-
-        /// @return Returns a list of the directories that are being watched
-        std::list<std::string> directories();
-
-  protected:
-        HANDLE mIOCP;
-        Watches mWatches;
-
-        /// The last watchid
-        WatchID mLastWatchID;
-        Thread* mThread;
-        Mutex mWatchesLock;
-
-        bool pathInWatches( const std::string& path );
-
-        /// Remove all directory watches.
-        void removeAllWatches();
-
-        void removeWatch( WatcherStructWin32* watch );
-
-  private:
-        void run();
-};
-
-} // namespace efsw
-
-#endif
-
-#endif
+#ifndef EFSW_FILEWATCHERWIN32_HPP

+#define EFSW_FILEWATCHERWIN32_HPP

+

+#include <efsw/base.hpp>

+

+#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32

+

+#include <efsw/WatcherWin32.hpp>

+#include <map>

+#include <unordered_set>

+#include <vector>

+

+namespace efsw {

+

+/// Implementation for Win32 based on ReadDirectoryChangesW.

+/// @class FileWatcherWin32

+class FileWatcherWin32 : public FileWatcherImpl {

+  public:

+        /// type for a map from WatchID to WatcherWin32 pointer

+        typedef std::unordered_set<WatcherStructWin32*> Watches;

+

+        FileWatcherWin32( FileWatcher* parent );

+

+        virtual ~FileWatcherWin32();

+

+        /// Add a directory watch

+        /// On error returns WatchID with Error type.

+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,

+                                          const std::vector<WatcherOption> &options ) override;

+

+        /// Remove a directory watch. This is a brute force lazy search O(nlogn).

+        void removeWatch( const std::string& directory ) override;

+

+        /// Remove a directory watch. This is a map lookup O(logn).

+        void removeWatch( WatchID watchid ) override;

+

+        /// Updates the watcher. Must be called often.

+        void watch() override;

+

+        /// Handles the action

+        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,

+                                           std::string oldFilename = "" ) override;

+

+        /// @return Returns a list of the directories that are being watched

+        std::vector<std::string> directories() override;

+

+  protected:

+        HANDLE mIOCP;

+        Watches mWatches;

+

+        /// The last watchid

+        WatchID mLastWatchID;

+        Thread* mThread;

+        Mutex mWatchesLock;

+

+        bool pathInWatches( const std::string& path ) override;

+

+        /// Remove all directory watches.

+        void removeAllWatches();

+

+        void removeWatch( WatcherStructWin32* watch );

+

+  private:

+        void run();

+};

+

+} // namespace efsw

+

+#endif

+

+#endif