Changeset 6919 for source/ariba/utility/serialization/DataStream.hpp

Timestamp:

Nov 13, 2009, 1:41:34 PM (14 years ago)

Author:

mies

Message:

Fixed tons of warnings when using CXXFLAGS="-Wall"!

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>
+        template<typename T, bool staticArray = false>
         class ArrayTpl : public ExplicitSerializer {
         private:
@@ -527 +527 @@
 
                 sznMethodBegin(X)
-                if (X.isDeserializer()) v = new T[l];
+                if (X.isDeserializer() && !staticArray) v = new T[l];
                 for (size_t i=0; i<l; i++) X && v[i];
                 sznMethodEnd()
@@ -556 +556 @@
         finline ArrayTpl<T> A( T*& array, size_t length ) {
                 return ArrayTpl<T>(array,length);
+        }
+
+        template<typename T>
+        finline ArrayTpl<T,true> static_A( T*& array, size_t length ) {
+                return ArrayTpl<T, true>(array,length);
         }