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

Timestamp:

May 26, 2009, 1:40:23 AM (15 years ago)

Author:

mies

Message:

Merged 20090512-mies-connectors changes r3472:r3689 into trunk.

File:

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

source/ariba/utility/serialization/DataStream.hpp

@@ -1 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35 +35 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef DATASTREAM_HPP_
@@ -42 +42 @@
 //== Library includes ==
 #include <boost/cstdint.hpp>
+#include <boost/type_traits/make_unsigned.hpp>
+
 #include <iostream>
 #include <vector>
@@ -153 +155 @@
         template<typename X>
         finline void remove(X& obj, if_uint(X)) {
+                if (!isMeasure()) bits[index].get(obj);
+                index += sizeof(X) * 8;
+        }
+
+        /* support signed ints */
+        template<typename X>
+        finline void add(X& sobj, if_int(X)) {
+                typedef typename boost::make_unsigned<X>::type UX;
+                UX& obj = *((UX*)&sobj);
+                if (!isMeasure())
+                bitcpy( sobj, 0, bits.getBuffer(), index);
+                index += sizeof(X) * 8;
+        }
+
+        template<typename X>
+        finline void remove(X& sobj, if_int(X)) {
+                typedef typename boost::make_unsigned<X>::type UX;
+                UX& obj = *((UX*)&sobj);
                 if (!isMeasure()) bits[index].get(obj);
                 index += sizeof(X) * 8;