diff options
| author | Glenn Smith <glenn@vector35.com> | 2025-04-24 14:46:37 -0400 |
|---|---|---|
| committer | Glenn Smith <glenn@vector35.com> | 2025-04-25 13:43:01 -0400 |
| commit | 9262278979709181414664053523657355762707 (patch) | |
| tree | c472e0620b1fdfe3b3c9fd26c7cbf41425b27740 /typearchive.cpp | |
| parent | 4aac12b0e429fedb02a645e5eb82ca2d88902e25 (diff) | |
std::function<bool(size_t,size_t)> ==> ProgressFunction
Diffstat (limited to 'typearchive.cpp')
| -rw-r--r-- | typearchive.cpp | 2 |
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; |