Revert "[DEV] remove detach function"

This reverts commit e620d6e.

src/libs/antares/study/parts/common/cluster_list.cpp

@@ -73,6 +73,15 @@ const ClusterT* ClusterList<ClusterT>::find(const ClusterT* p) const
     return (it != clusters.end()) ? it->get() : nullptr;
 }
 
+template<class ClusterT>
+typename std::shared_ptr<ClusterT> ClusterList<ClusterT>::detach(iterator i)
+{
+    SharedPtr c = *i;
+    clusters.erase(i);
+    rebuildIndex();
+    return c;
+}
+
 template<class ClusterT>
 bool ClusterList<ClusterT>::exists(const Data::ClusterName& id) const
 {

src/libs/antares/study/parts/common/cluster_list.h

@@ -56,6 +56,15 @@ class ClusterList
     */
 
     SharedPtr add(const SharedPtr clusters);
+    /*!
+    ** \brief Detach a clusters represented by an iterator
+    **
+    ** The clusters will be removed from the list but _not_
+    ** destroyed.
+    ** The iterator should considered as invalid after using this method.
+    ** \return A pointer to the clusters, NULL if an error has occured
+    */
+    SharedPtr detach(iterator i);
 
     /*!
     ** \brief Try to find a clusters from its id (const)

src/libs/antares/study/parts/thermal/container.cpp

@@ -96,12 +96,12 @@ uint PartThermal::prepareClustersInMustRunMode()
     do
     {
         mustContinue = false;
-        for (auto& c : clusters)
+        for (auto i = list.begin(); i != list.end(); ++i)
         {
-            if (c->mustrun)
+            if ((*i)->mustrun)
             {
-                list.remove(c->id());
-                std::shared_ptr<ThermalCluster> cluster(c);
+                // Detaching the thermal cluster from the main list...
+                std::shared_ptr<ThermalCluster> cluster = list.detach(i);
                 if (!cluster->enabled)
                     continue;
                 // ...and attaching it into the second list

src/ui/simulator/toolbox/components/map/manager.cpp

@@ -768,7 +768,7 @@ void Manager::selectFromBoundingBox(const wxPoint& a, const wxPoint& b, const si
                             for (Data::ThermalClusterList::iterator t = area->thermal.list.begin();
                                  t != tend;
                                  ++t)
-                                clusterlist.push_back(t->get());
+                                clusterlist.push_back((*t).get());
                         }
                         continue;
                     }