Merge branch '11.7' into 'master'11.7

add upstream 11.7

See merge request opensource-tracking/FreeFileSync!31

1 files changed, 2 insertions, 7 deletions

diff --git a/zen/resolve_path.cpp b/zen/resolve_path.cpp
index 76999500..0e714528 100644
--- a/zen/resolve_path.cpp
+++ b/zen/resolve_path.cpp
@@ -5,17 +5,12 @@
 // *****************************************************************************
 
 #include "resolve_path.h"
-//#include <set> //not necessarily included by <map>!
-//#include <map>
 #include "time.h"
 #include "thread.h"
-//#include "utf.h"
-//#include "scope_guard.h"
-//#include "globals.h"
 #include "file_access.h"
 
     #include <stdlib.h> //getenv()
-    #include <unistd.h> //getcwd
+    #include <unistd.h> //getcwd()
 
 using namespace zen;
 
@@ -251,7 +246,7 @@ std::vector<Zstring> zen::getFolderPathAliases(const Zstring& folderPathPhrase)
     tmp.erase(dirPath);
     tmp.erase(Zstring());
 
-    return { tmp.begin(), tmp.end() };
+    return {tmp.begin(), tmp.end()};
 }