1.15

1 files changed, 6 insertions, 5 deletions

diff --git a/algorithm.h b/algorithm.h
index 7d20e22b..31c7e9ca 100644
--- a/algorithm.h
+++ b/algorithm.h
@@ -15,14 +15,12 @@ namespace FreeFileSync
 
     void adjustModificationTimes(const Zstring& parentDirectory, const int timeInSeconds, ErrorHandler* errorHandler) throw(AbortThisProcess);
 
-    void deleteOnGridAndHD(FileCompareResult& grid, const set<int>& rowsToDelete, ErrorHandler* errorHandler, const bool useRecycleBin) throw(AbortThisProcess);
-    void addSubElements(set<int>& subElements, const FileCompareResult& grid, const FileCompareLine& relevantRow);
+    void deleteOnGridAndHD(FileCompareResult& grid, const std::set<int>& rowsToDelete, ErrorHandler* errorHandler, const bool useRecycleBin) throw(AbortThisProcess);
+    void addSubElements(std::set<int>& subElements, const FileCompareResult& grid, const FileCompareLine& relevantRow);
 
     void filterCurrentGridData(FileCompareResult& currentGridData, const wxString& includeFilter, const wxString& excludeFilter);
     void removeFilterOnCurrentGridData(FileCompareResult& currentGridData);
 
-    bool sameFileTime(const time_t a, const time_t b);
-
     wxString utcTimeToLocalString(const time_t utcTime);
 
     //enhanced binary search template: returns an iterator
@@ -37,13 +35,16 @@ namespace FreeFileSync
     }
 
 #ifdef FFS_WIN
+    bool isFatDrive(const Zstring& directoryName);
+
 //detect if FAT/FAT32 drive needs a +-1h time shift after daylight saving time (DST) switch due to known windows bug:
 //http://www.codeproject.com/KB/datetime/dstbugs.aspx
 
 //NO performance issue: debug build: 50 ms for 200000 files processed in for-loop
-    void checkForDSTChange(const FileCompareResult& gridData, const vector<FolderPair>& directoryPairsFormatted, int& timeShift, wxString& driveName);
+    void checkForDSTChange(const FileCompareResult& gridData, const std::vector<FolderPair>& directoryPairsFormatted, int& timeShift, wxString& driveName);
 #endif  //FFS_WIN
 
 }
 
+
 #endif // ALGORITHM_H_INCLUDED