diff options
Diffstat (limited to 'synchronization.h')
| -rw-r--r-- | synchronization.h | 4 |
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; }; |