diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:56:14 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:56:14 +0200 |
commit | 1046c195a9bbac24678c06310a4dd56b10347244 (patch) | |
tree | 89ad9f6fe3e538d65ef973b628ed9284b6c99e9f /FreeFileSync.h | |
parent | 1.14 (diff) | |
download | FreeFileSync-1046c195a9bbac24678c06310a4dd56b10347244.tar.gz FreeFileSync-1046c195a9bbac24678c06310a4dd56b10347244.tar.bz2 FreeFileSync-1046c195a9bbac24678c06310a4dd56b10347244.zip |
1.15
Diffstat (limited to 'FreeFileSync.h')
-rw-r--r-- | FreeFileSync.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/FreeFileSync.h b/FreeFileSync.h index 4b269863..c4771171 100644 --- a/FreeFileSync.h +++ b/FreeFileSync.h @@ -97,13 +97,13 @@ namespace FreeFileSync if (aLength != bLength) return aLength < bLength; #ifdef FFS_WIN //Windows does NOT distinguish between upper/lower-case - return relativeName.CmpNoCase(b.relativeName) < 0; + return relativeName.CmpNoCase(b.relativeName) < 0; //implementing a (reverse) comparison manually is a lot slower! #elif defined FFS_LINUX //Linux DOES distinguish between upper/lower-case return relativeName.Cmp(b.relativeName) < 0; #endif } }; - typedef vector<FileDescrLine> DirectoryDescrType; + typedef std::vector<FileDescrLine> DirectoryDescrType; enum CompareFilesResult @@ -129,11 +129,11 @@ namespace FreeFileSync CompareFilesResult cmpResult; bool selectedForSynchronization; }; - typedef vector<FileCompareLine> FileCompareResult; + typedef std::vector<FileCompareLine> FileCompareResult; typedef int GridViewLine; - typedef vector<GridViewLine> GridView; //vector of references to lines in FileCompareResult + typedef std::vector<GridViewLine> GridView; //vector of references to lines in FileCompareResult struct FolderPair @@ -150,7 +150,7 @@ namespace FreeFileSync ~AbortThisProcess() {} }; - const int FILE_TIME_PRECISION = 2; //file times have precision of 2 seconds due to FAT/FAT32 file systems + const time_t FILE_TIME_PRECISION = 2; //file times have precision of 2 seconds due to FAT/FAT32 file systems const wxString LAST_CONFIG_FILE = wxT("LastRun.ffs_gui"); const wxString GLOBAL_CONFIG_FILE = wxT("GlobalSettings.xml"); } |