sets byIndex

AntaresSimulatorTeam · Jul 18, 2024 · 6015a25 · 6015a25
1 parent 6c3646b
commit 6015a25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/src/libs/antares/study/include/antares/study/sets.h b/src/libs/antares/study/include/antares/study/sets.h
@@ -134,7 +134,7 @@ class Sets final
     */
     Sets(const Sets& rhs);
     //! Destructor
-    ~Sets();
+    ~Sets() = default;
     //@}
 
     //! \name Iterators
@@ -269,7 +269,7 @@ class Sets final
     MapType pMap;
     MapOptions pOptions;
     //!
-    TypePtr* pByIndex;
+    std::vector<TypePtr> pByIndex;
     IDType* pNameByIndex;
     mutable bool pModified;
 

diff --git a/src/libs/antares/study/include/antares/study/sets.hxx b/src/libs/antares/study/include/antares/study/sets.hxx
@@ -27,7 +27,6 @@ namespace Data
 {
 template<class T>
 inline Sets<T>::Sets():
-    pByIndex(NULL),
     pNameByIndex(NULL),
     pModified(false)
 {
@@ -37,7 +36,6 @@ template<class T>
 inline Sets<T>::Sets(const Sets& rhs):
     pMap(rhs.pMap),
     pOptions(rhs.pOptions),
-    pByIndex(NULL),
     pNameByIndex(NULL),
     pModified(false)
 {
@@ -47,12 +45,6 @@ inline Sets<T>::Sets(const Sets& rhs):
     }
 }
 
-template<class T>
-inline Sets<T>::~Sets()
-{
-    delete[] pByIndex;
-}
-
 template<class T>
 typename Sets<T>::iterator Sets<T>::begin()
 {
@@ -80,11 +72,7 @@ typename Sets<T>::const_iterator Sets<T>::end() const
 template<class T>
 void Sets<T>::clear()
 {
-    if (pByIndex)
-    {
-        delete[] pByIndex;
-        pByIndex = NULL;
-    }
+    pByIndex.clear();
     if (pNameByIndex)
     {
         delete[] pNameByIndex;
@@ -401,12 +389,11 @@ void Sets<T>::rebuildFromRules(const IDType& id, HandlerT& handler)
 template<class T>
 void Sets<T>::rebuildIndexes()
 {
-    delete[] pByIndex;
     delete[] pNameByIndex;
-
+    pByIndex.clear();
     if (!pMap.empty())
     {
-        pByIndex = new TypePtr[pMap.size()];
+        pByIndex.resize(pMap.size());
         pNameByIndex = new IDType[pMap.size()];
         const typename MapType::iterator end = pMap.end();
         uint index = 0;
@@ -419,7 +406,6 @@ void Sets<T>::rebuildIndexes()
     }
     else
     {
-        pByIndex = NULL;
         pNameByIndex = NULL;
     }
 }