Changeset 6786 for source/ariba/utility/serialization/Data.hpp

Timestamp:

Nov 2, 2009, 1:31:19 AM (14 years ago)

Author:

mies

Message:

Changed Data to Message conversion constructor in Message to explicit
Fixed some general bugs in Data: operator<<
Fixed bug in DHTMessage: allow unspecified key/values
Added local DHT message delivery
Adapted sources to work with gcc 4.4.1

File:

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

source/ariba/utility/serialization/Data.hpp

@@ -49 +49 @@
 template<typename T = uint8_t, typename DataModel = DefaultDataModel<uint8_t> > class DataTpl;
 typedef DataTpl<> Data;
-template<typename T, typename DataModel> std::ostream& operator<<(std::ostream& stream, DataTpl<T, DataModel>& data);
+template<typename T, typename DataModel> std::ostream& operator<<(std::ostream& stream, const DataTpl<T, DataModel>& data);
 
 //== internal includes ==
@@ -324 +324 @@
 };
 
-/* default human readable text output */
-template<typename T, typename DataModel>
-std::ostream& operator<<(std::ostream& stream, DataTpl<T, DataModel>& data) {
-        stream << "[" << bitstr(data.getBuffer(), data.getLength(), 4)
-                        << "|'";
-        char* buffer = (char*) data.getBuffer();
-        for (size_t i = 0; i < data.getLength() / 8; i++) {
-                char c = buffer[i] < 32 ? '.' : buffer[i];
-                stream << c;
-        }
-        stream << "']";
-        return stream;
-}
-
 /* unspecified type */
 template<typename T, typename DataModel>
@@ -397 +383 @@
 
         finline int32_t length() const {
-                return bufferLen;
+                return (bufferLen == -1) ? 0 : bufferLen;
         }
 
@@ -442 +428 @@
 }sznEnd();
 
+/* default human readable text output */
+template<typename T, typename DataModel>
+std::ostream& operator<<(std::ostream& stream, const DataTpl<T, DataModel>& data) {
+        stream << "[" << bitstr(data.getBuffer(), data.getLength(), 4)
+                        << "|'";
+        const char* buffer = (const char*) data.getBuffer();
+        for (size_t i = 0; i < data.getLength() / 8; i++) {
+                char c = buffer[i] < 32 ? '.' : buffer[i];
+                stream << c;
+        }
+        stream << "']";
+        return stream;
+}
 #endif /* DATA_HPP_ */