Changeset 6921 for source/ariba

Timestamp:

Nov 13, 2009, 3:50:40 PM (14 years ago)

Author:

mies

Message:

fixed bug in array serializer
added static array serializer

File:

• source/ariba/utility/serialization/DataStream.hpp (modified) (3 diffs)

source/ariba/utility/serialization/DataStream.hpp

@@ -516 +516 @@
 
         /* array and vector support */
-        template<typename T, bool staticArray = false>
+        template<typename T>
         class ArrayTpl : public ExplicitSerializer {
         private:
@@ -524 +524 @@
         public:
                 finline ArrayTpl( T*& array, size_t length ) :
-                v(0), l(length) {}
-
-                sznMethodBegin(X)
-                if (X.isDeserializer() && !staticArray) v = new T[l];
+                v(array), l(length) {}
+
+                sznMethodBegin(X)
+                if (X.isDeserializer()) v = new T[l];
+                for (size_t i=0; i<l; i++) X && v[i];
+                sznMethodEnd()
+        };
+
+        template<typename T>
+        class StaticArrayTpl : public ExplicitSerializer {
+        private:
+                T* v;
+                size_t l;
+
+        public:
+                finline StaticArrayTpl( T* array, size_t length ) :
+                v(array), l(length) {}
+
+                sznMethodBegin(X)
                 for (size_t i=0; i<l; i++) X && v[i];
                 sznMethodEnd()
@@ -559 +574 @@
 
         template<typename T>
-        finline ArrayTpl<T,true> static_A( T*& array, size_t length ) {
-                return ArrayTpl<T, true>(array,length);
+        finline StaticArrayTpl<T> static_A( T* array, size_t length ) {
+                return StaticArrayTpl<T>(array,length);
         }