Changeset 6922 for source/ariba/utility/serialization

Timestamp:

Nov 13, 2009, 8:05:41 PM (14 years ago)

Author:

mies

Message:

replaced deprecated hash_map, hash_set classes with boost
added unsigned serialization
fixed more warnings
included -Wall to Makefile.am

Location:

source/ariba/utility/serialization

Files:

• Data.hpp (modified) (2 diffs)
• DataStream.hpp (modified) (1 diff)
• TestSerialization.cpp (modified) (4 diffs)
• TestSerialization.h (added)

source/ariba/utility/serialization/Data.hpp

@@ -44 +44 @@
 #include <iostream>
 #include <boost/cstdint.hpp>
+#include <boost/type_traits/make_unsigned.hpp>
 
 // forward declaration
@@ -119 +120 @@
                 template<typename X>
                 finline void get(X& value, size_t length = sizeof(X) * 8, if_int(X)) const {
-                        _unsigned(value) = bitget<X> (bits.buffer(), index, length);
+                        typedef typename boost::make_unsigned<X>::type unsigned_type;
+                        _unsigned(value) = bitget<unsigned_type> (bits.buffer(), index, length);
                 }
 

source/ariba/utility/serialization/DataStream.hpp

@@ -543 +543 @@
 
                 sznMethodBegin(X)
-                for (size_t i=0; i<l; i++) X && v[i];
+                        for (size_t i=0; i<l; i++) X && v[i];
                 sznMethodEnd()
         };

source/ariba/utility/serialization/TestSerialization.cpp

@@ -37 +37 @@
 // [License]
 
+#include "TestSerialization.h"
 #include "Data.hpp"
 #include "DataStream.hpp"
@@ -54 +55 @@
         Aclass* vclass;
         bool vcls;
+        uint8_t* static_array;
 
         Aclass(bool vcls = false) {
                 text = new char[80];
+                static_array = new uint8_t[20];
+                for (size_t i=0; i<20; i++) static_array[i] = i;
                 strcpy(text, "Hallo!");
                 str = "std::string:)";
@@ -94 +98 @@
 
 sznBeginDefault( Aclass, X ){
+        double xpos;
         X && x && b && I(y,6) && T(text) && T(str) && A(v,4) && I(z) && vcls;
+        X && static_A(static_array,20);
+        X && static_A( (uint8_t*)&xpos, 8 );
         if (vcls) X && VO(vclass);
 }sznEnd()
@@ -100 +107 @@
 vsznDefault( Aclass );
 
-int main() {
+int test_serialization() {
         using namespace std;