summaryrefslogtreecommitdiff
path: root/typearchive.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'typearchive.cpp')
-rw-r--r--typearchive.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/typearchive.cpp b/typearchive.cpp
index 77841472..acd4447b 100644
--- a/typearchive.cpp
+++ b/typearchive.cpp
@@ -576,7 +576,7 @@ std::optional<std::string> TypeArchive::MergeSnapshots(
const std::string& secondSnapshot,
const std::unordered_map<std::string, std::string>& mergeConflictsIn,
std::unordered_set<std::string>& mergeConflictsOut,
- std::function<bool(size_t, size_t)> progress
+ ProgressFunction progress
)
{
std::vector<const char*> mergeConflictKeysIn;