Update libsolidity/interface/Natspec.cpp

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
ethereum · Apr 29, 2023 · d0bf624 · d0bf624
1 parent 2750919
commit d0bf624
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
@@ -275,15 +275,13 @@ vector<EventDefinition const*>  Natspec::uniqueInterfaceEvents(ContractDefinitio
 
 	set<EventDefinition const*, decltype(compareBySignature)> filteredUsedEvents{compareBySignature};
 	set<string> usedSignatures;
-	pair<set<string>::iterator, bool> signatureResult;
-	pair<set<EventDefinition const*, decltype(compareBySignature)>::iterator, bool> eventResult;
 	for (EventDefinition const* event: _contract.usedInterfaceEvents())
 	{
-		eventResult = filteredUsedEvents.insert(event);
-		signatureResult = usedSignatures.insert(eventSignature(event));
-		if (signatureResult.second == false)
+		auto&& [eventIt, eventInserted] = filteredUsedEvents.insert(event);
+		auto&& [signatureIt, signatureInserted] = usedSignatures.insert(eventSignature(event));
+		if (!signatureInserted)
 				// Either the old event or the new one will be erased
-				filteredUsedEvents.erase(eventResult.first);
+				filteredUsedEvents.erase(eventIt);
 	}
 
 	uniqueEvents += filteredUsedEvents;