From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 9 May 2012 11:49:26 +0000 (+0200)
Subject: Build fix for RHEL 5.3
X-Git-Tag: v0.0.1~539
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42881d4b8a2216d2f0aa96bbbad9b6cac7870b1f;p=icinga2

Build fix for RHEL 5.3
---

diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index fc9343dfa..9f85a31dc 100644
--- a/components/discovery/discoverycomponent.cpp
+++ b/components/discovery/discoverycomponent.cpp
@@ -573,14 +573,17 @@ int DiscoveryComponent::DiscoveryTimerHandler(const TimerEventArgs& tea)
 	ConfigCollection::Ptr endpointCollection = GetApplication()->GetConfigHive()->GetCollection("endpoint");
 	endpointCollection->ForEachObject(bind(&DiscoveryComponent::EndpointConfigHandler, this, _1));
 
-	map<string, ComponentDiscoveryInfo::Ptr>::iterator i;
+	map<string, ComponentDiscoveryInfo::Ptr>::iterator curr, i;
 	for (i = m_Components.begin(); i != m_Components.end(); ) {
 		string identity = i->first;
 		ComponentDiscoveryInfo::Ptr info = i->second;
 
+		curr = i;
+		i++;
+
 		if (info->LastSeen < now - DiscoveryComponent::RegistrationTTL) {
 			/* unregister this component if its registration has expired */
-			i = m_Components.erase(i);
+			m_Components.erase(curr);
 			continue;
 		}
 
@@ -599,8 +602,6 @@ int DiscoveryComponent::DiscoveryTimerHandler(const TimerEventArgs& tea)
 			/* try and reconnect to this component */
 			endpointManager->AddConnection(info->Node, info->Service);
 		}
-
-		i++;
 	}
 
 	return 0;
diff --git a/icinga/endpoint.cpp b/icinga/endpoint.cpp
index 76d11dbbb..f84c07ee2 100644
--- a/icinga/endpoint.cpp
+++ b/icinga/endpoint.cpp
@@ -145,4 +145,4 @@ void Endpoint::SetSentWelcome(bool value)
 bool Endpoint::GetSentWelcome(void) const
 {
 	return m_SentWelcome;
-}
\ No newline at end of file
+}