diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:28:01 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:28:01 +0200 |
| commit | fe9eb89ebc1b3c33cbac00a3fa095a14faef9113 (patch) | |
| tree | 8a3bb620a9acb83fe0057061a86e8f2cb91a9fe1 /synchronization.h | |
| parent | 5.21 (diff) | |
| download | FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.gz FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.bz2 FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.zip | |
5.22
Diffstat (limited to 'synchronization.h')
| -rw-r--r-- | synchronization.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synchronization.h b/synchronization.h index 75612d8b..bc6b79db 100644 --- a/synchronization.h +++ b/synchronization.h @@ -34,7 +34,7 @@ public: int getConflict() const { return static_cast<int>(conflictMsgs.size()); } - typedef std::vector<std::pair<Zstring, std::wstring> > ConflictTexts; // Pair(filename/conflict text) + typedef std::vector<std::pair<Zstring, std::wstring>> ConflictTexts; // Pair(filename/conflict text) const ConflictTexts& getConflictMessages() const { return conflictMsgs; } Int64 getDataToProcess() const { return dataToProcess; } |