Build fix for RHEL 5.3

diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index fc9343dfa097194c601237f8474304607096319c..9f85a31dca27e59693d531a1b42146c66179a96c 100644 (file)
--- 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 76d11dbbb37e8be0c911134b4ce3b33069af7265..f84c07ee2b6e685a0d2cc90fddb4ee4b06601ca8 100644 (file)
--- 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
+}