From 7c25ac86a12f6cdf78c28821ed6d68dbbc064eb5 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 27 Feb 2023 06:01:01 -0500 Subject: [PATCH] Unused argument removed --- libraries/lib-registries/Registry.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libraries/lib-registries/Registry.cpp b/libraries/lib-registries/Registry.cpp index 9ff606a833b8..2f6eda6aa2b2 100644 --- a/libraries/lib-registries/Registry.cpp +++ b/libraries/lib-registries/Registry.cpp @@ -88,9 +88,7 @@ struct CollectedItems -> bool; auto MergeLikeNamedItems(ItemOrdering &itemOrdering, - NewItems::const_iterator left, NewItems::const_iterator right, - int iPass ) - -> void; + NewItems::const_iterator left, NewItems::const_iterator right) -> void; void MergeItemsAscendingNamesPass(ItemOrdering &itemOrdering, NewItems &newItems, int iPass, size_t endItemsCount, bool force); @@ -523,10 +521,8 @@ auto CollectedItems::InsertFirstNamedItem(ItemOrdering &itemOrdering, return success; } -auto CollectedItems::MergeLikeNamedItems(ItemOrdering &itemOrdering, - NewItems::const_iterator left, NewItems::const_iterator right, - const int iPass ) - -> void +void CollectedItems::MergeLikeNamedItems(ItemOrdering &itemOrdering, + NewItems::const_iterator left, NewItems::const_iterator right) { // Resolve collisions among remaining like-named items. auto iter = left; @@ -586,7 +582,7 @@ void CollectedItems::MergeItemsAscendingNamesPass(ItemOrdering &itemOrdering, *left, endItemsCount, force ); if (success) - MergeLikeNamedItems(itemOrdering, left, right, iPass); + MergeLikeNamedItems(itemOrdering, left, right); if ( success ) { auto diff = rend - rleft; @@ -614,7 +610,7 @@ void CollectedItems::MergeItemsDescendingNamesPass(ItemOrdering &itemOrdering, *left, endItemsCount, force ); if (success) - MergeLikeNamedItems(itemOrdering, left, right, iPass); + MergeLikeNamedItems(itemOrdering, left, right); if ( success ) left = newItems.erase( left, right ); @@ -670,7 +666,7 @@ void CollectedItems::MergeItems(ItemOrdering &itemOrdering, auto right = iter + 1; while ( right != end && right->first->name == name ) ++right; - MergeLikeNamedItems(itemOrdering, iter, right, -1); + MergeLikeNamedItems(itemOrdering, iter, right); iter = right; }