From d4af25c52a28b93484ffb55e0a8027bc4ce7856f Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:21:59 +0200 Subject: 5.9 --- file_hierarchy.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'file_hierarchy.h') diff --git a/file_hierarchy.h b/file_hierarchy.h index 4139a53a..5a5b5818 100644 --- a/file_hierarchy.h +++ b/file_hierarchy.h @@ -86,8 +86,8 @@ class FileMapping; class SymLinkMapping; class FileSystemObject; - //------------------------------------------------------------------ + /* ERD: DirContainer 1 --> 0..n DirContainer @@ -217,8 +217,8 @@ private: BaseDirMapping& root_; }; - //------------------------------------------------------------------ + class BaseDirMapping : public HierarchyObject //synchronization base directory { public: @@ -430,6 +430,8 @@ private: std::unique_ptr syncDirConflict; //non-empty if we have a conflict setting sync-direction //get rid of std::wstring small string optimization (consumes 32/48 byte on VS2010 x86/x64!) + //Note: we model *four* states with last two variables => "syncDirConflict is empty or syncDir == NONE" is a class invariant!!! + Zstring shortNameLeft_; //slightly redundant under linux, but on windows the "same" filenames can differ in case Zstring shortNameRight_; //use as indicator: an empty name means: not existing! -- cgit