Fix #29: make Vector emove have consistent behavior with the rest of …

…Collection derived classes
dingmaotu · Apr 11, 2018 · 66c7b16 · 66c7b16
1 parent 4362062
commit 66c7b16
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Collection/Vector.mqh b/Collection/Vector.mqh
@@ -109,10 +109,15 @@ public:
             if(i!=j) { m_array[i]=m_array[j]; }
             i++;
            }
-         // in this case, it is no point to check m_owned and SafeDelete value
         }
-      if(i<s) ArrayResize(m_array,i);
-      return ((s-i)> 0);
+      if(i<s)
+        {
+         ArrayResize(m_array,i);
+         // to conform to Collection semantics, a removed value should be deleted if it is owned
+         if(m_owned) SafeDelete(value);
+         return true;
+        }
+      return false;
      }
 
    // Sequence interface

diff --git a/Trade/OrderGroup.mqh b/Trade/OrderGroup.mqh
@@ -125,6 +125,6 @@ void OrderGroup::clearClosed(void)
          set(i,0);
         }
      }
-   removeAll(0);
+   remove(0);
   }
 //+------------------------------------------------------------------+