Skip to content

Commit

Permalink
Unused argument removed
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul-Licameli committed Apr 24, 2024
1 parent 2cf177a commit 7c25ac8
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions libraries/lib-registries/Registry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 7c25ac8

Please sign in to comment.