summaryrefslogtreecommitdiff
path: root/synchronization.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:50 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:50 +0200
commit7e706cf64654aea466c059c307e5723e2423ed5d (patch)
treee85f0d28d7c81b6d21419fc38e1a654cca2212b1 /synchronization.h
parent5.5 (diff)
downloadFreeFileSync-7e706cf64654aea466c059c307e5723e2423ed5d.tar.gz
FreeFileSync-7e706cf64654aea466c059c307e5723e2423ed5d.tar.bz2
FreeFileSync-7e706cf64654aea466c059c307e5723e2423ed5d.zip
5.6
Diffstat (limited to 'synchronization.h')
-rw-r--r--synchronization.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/synchronization.h b/synchronization.h
index dfead072..78cd8a61 100644
--- a/synchronization.h
+++ b/synchronization.h
@@ -37,7 +37,7 @@ public:
typedef std::vector<std::pair<Zstring, std::wstring> > ConflictTexts; // Pair(filename/conflict text)
const ConflictTexts& getConflictMessages() const { return conflictMsgs; }
- zen::Int64 getDataToProcess() const { return dataToProcess; }
+ Int64 getDataToProcess() const { return dataToProcess; }
size_t getRowCount() const { return rowsTotal; }
private:
@@ -55,7 +55,7 @@ private:
int deleteLeft, deleteRight;
// int conflict;
ConflictTexts conflictMsgs; //conflict texts to display as a warning message
- zen::Int64 dataToProcess;
+ Int64 dataToProcess;
size_t rowsTotal;
};
bgstack15