5.9

1 files changed, 4 insertions, 2 deletions

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<std::wstring> 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!