sdk: Fixed projects output directories, config/platform lib overrides; Fixed 64 bit...

[sdk] / ecere / src / com / containers / Map.ec

diff --git a/ecere/src/com/containers/Map.ec b/ecere/src/com/containers/Map.ec
index 622c1d3..7a8c549 100644 (file)
--- a/ecere/src/com/containers/Map.ec
+++ b/ecere/src/com/containers/Map.ec
@@ -142,7 +142,13 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
       MapNode<MT, V> node;
       while(node = root)
       {
-         delete node.value;
+         MapNode<MT, V> n = node;
+
+         // Adjust node pointer for non-standard AVLNode
+         if(class(MT).type == structClass)
+            n = (MapNode<MT, V>)(((byte *) node) + class(MT).structSize - sizeof(node.AVLNode::key));
+
+         delete n.value;
          Remove(node);
       }
    }