ecere;Container;Map; fix serialization of strings.

diff --git a/ecere/src/com/containers/Container.ec b/ecere/src/com/containers/Container.ec
index bf59837..a12913f 100644 (file)
--- a/ecere/src/com/containers/Container.ec
+++ b/ecere/src/com/containers/Container.ec
@@ -259,7 +259,7 @@ public:
       uint count = GetCount();
       IteratorPointer i;
       Class Dclass = class(D);
-      bool isNormalClass = Dclass.type == normalClass;
+      bool isNormalClass = (Dclass.type == normalClass) && Dclass.structSize;
 
       channel.Put(count);
       for(i = GetFirst(); i; i = GetNext(i))

diff --git a/ecere/src/com/containers/Map.ec b/ecere/src/com/containers/Map.ec
index 031fcaf..b9fc940 100644 (file)
--- a/ecere/src/com/containers/Map.ec
+++ b/ecere/src/com/containers/Map.ec
@@ -245,8 +245,8 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
       IteratorPointer i;
       Class Kclass = class(MT);
       Class Dclass = class(V);
-      bool kIsNormalClass = Kclass.type == normalClass;
-      bool dIsNormalClass = Dclass.type == normalClass;
+      bool kIsNormalClass = (Kclass.type == normalClass) && Kclass.structSize;
+      bool dIsNormalClass = (Dclass.type == normalClass) && Dclass.structSize;
 
       channel.Put(count);
       for(i = GetFirst(); i; i = GetNext(i))