From 9262278979709181414664053523657355762707 Mon Sep 17 00:00:00 2001 From: Glenn Smith Date: Thu, 24 Apr 2025 14:46:37 -0400 Subject: std::function ==> ProgressFunction --- typearchive.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'typearchive.cpp') diff --git a/typearchive.cpp b/typearchive.cpp index 77841472..acd4447b 100644 --- a/typearchive.cpp +++ b/typearchive.cpp @@ -576,7 +576,7 @@ std::optional TypeArchive::MergeSnapshots( const std::string& secondSnapshot, const std::unordered_map& mergeConflictsIn, std::unordered_set& mergeConflictsOut, - std::function progress + ProgressFunction progress ) { std::vector mergeConflictKeysIn; -- cgit v1.3.1