Merge branch 'b11.20' into 'master'11.20

add upstream 11.20

See merge request opensource-tracking/FreeFileSync!43

1 files changed, 3 insertions, 4 deletions

diff --git a/FreeFileSync/Source/base/algorithm.h b/FreeFileSync/Source/base/algorithm.h
index 4ef7f9bb..b1ddcce3 100644
--- a/FreeFileSync/Source/base/algorithm.h
+++ b/FreeFileSync/Source/base/algorithm.h
@@ -64,7 +64,7 @@ void copyToAlternateFolder(std::span<const FileSystemObject* const> rowsToCopyOn
                            bool keepRelPaths,
                            bool overwriteIfExists,
                            WarningDialogs& warnings,
-                           ProcessCallback& callback);
+                           ProcessCallback& callback /*throw X*/); //throw X
 
 //manual deletion of files on main grid
 void deleteFromGridAndHD(const std::vector<FileSystemObject*>& rowsToDeleteOnLeft,  //refresh GUI grid after deletion to remove invalid rows
@@ -73,7 +73,7 @@ void deleteFromGridAndHD(const std::vector<FileSystemObject*>& rowsToDeleteOnLef
                          bool useRecycleBin,
                          //global warnings:
                          bool& warnRecyclerMissing,
-                         ProcessCallback& callback);
+                         ProcessCallback& callback /*throw X*/); //throw X
 
 struct FileDescriptor
 {
@@ -95,8 +95,7 @@ public:
     Zstring getTempPath(const FileDescriptor& descr) const; //returns empty if not in buffer (item not existing, error during copy)
 
     //contract: only add files not yet in the buffer!
-    void createTempFiles(const std::set<FileDescriptor>& workLoad, ProcessCallback& callback);
-
+    void createTempFiles(const std::set<FileDescriptor>& workLoad, ProcessCallback& callback /*throw X*/); //throw X
 
 private:
     TempFileBuffer           (const TempFileBuffer&) = delete;