Merge pull request #10943 from Icinga/backport-10942-to-support/2.16

[Backport support/2.16] Work around a compiler segfault on SLES 15.7 aarch64

Author: Al2Klimov

lib/base/dictionary.cpp

@@ -155,17 +155,16 @@ Dictionary::Iterator Dictionary::End()
  * Removes the item specified by the iterator from the dictionary.
  *
  * @param it The iterator.
- * @return an iterator to the element after the removed element.
  */
-Dictionary::Iterator Dictionary::Remove(Dictionary::Iterator it)
+void Dictionary::Remove(Dictionary::Iterator it)
 {
 	ASSERT(OwnsLock());
 	std::unique_lock<std::shared_timed_mutex> lock (m_DataMutex);
 
 	if (m_Frozen)
 		BOOST_THROW_EXCEPTION(std::invalid_argument("Dictionary must not be modified."));
 
-	return m_Data.erase(it);
+	m_Data.erase(it);
 }
 
 /**

lib/base/dictionary.hpp

@@ -56,7 +56,7 @@ class Dictionary final : public Object
 
 	void Remove(const String& key);
 
-	Iterator Remove(Iterator it);
+	void Remove(Iterator it);
 
 	void Clear();
 

lib/remote/apilistener-configsync.cpp

@@ -580,10 +580,10 @@ void ApiListener::PruneDeletedRuntimeObjects()
 
 	for (auto it = deletedRuntimeObjects->Begin(); it != deletedRuntimeObjects->End();) {
 		if (it->second < cutoff) {
-			it = deletedRuntimeObjects->Remove(it);
+			deletedRuntimeObjects->Remove(it++);
 		} else {
-			it++;
-		};
+			++it;
+		}
 	}
 }