Changeset 11730 for trunk/FACT++/src/DimServiceInfoList.cc

Timestamp:

07/31/11 12:02:11 (13 years ago)

Author:

tbretz

Message:

When removing something from a list we have to pass a copy instead of a reference otherwise the removal might remove the source of the reference.

File:

• trunk/FACT++/src/DimServiceInfoList.cc (modified) (2 diffs)

trunk/FACT++/src/DimServiceInfoList.cc

@@ -113 +113 @@
 //!
 //! @param s
-//!     server which should be removed
+//!     server which should be removed. We need to make a copy, otherwise
+//!     RemoveServer will destroy the staring the reference is pointing to
 //!
 //! @throws
 //!     a runtime_error is the server to be removed is not in the list
 //
-void DimServiceInfoList::RemoveServer(const string &s)
+void DimServiceInfoList::RemoveServer(const string s)
 {
     const ServiceInfoList::iterator v = fServiceInfoList.find(s);
@@ -149 +150 @@
 {
     while (fServiceInfoList.size()>0)
-    {
-        // We need to make a copy, otherwise RemoveServer will
-        // destroy the staring the reference is pointing to
-        const string name = fServiceInfoList.begin()->first;
-        RemoveServer(name);
-    }
+        RemoveServer(fServiceInfoList.begin()->first);
 }