Started integration of Variants into InputStreamr

diff --git a/src/CommonAPI/DBus/DBusInputStream.cpp b/src/CommonAPI/DBus/DBusInputStream.cpp
index a5f729a..afed173 100644 (file)
--- a/src/CommonAPI/DBus/DBusInputStream.cpp
+++ b/src/CommonAPI/DBus/DBusInputStream.cpp
@@ -112,6 +112,15 @@ void DBusInputStream::beginReadSerializableStruct(const SerializableStruct& seri
 
 void DBusInputStream::endReadSerializableStruct(const SerializableStruct& serializableStruct) { }
 
+void DBusInputStream::readSerializableVariant(SerializableVariant& serializableVariant) {
+    alignToBoundary(8);
+    uint8_t containedTypeIndex;
+    readValue(containedTypeIndex);
+    skipOverSignature();
+
+    serializableVariant.readFromInputStream(containedTypeIndex, *this);
+}
+
 
 void DBusInputStream::beginReadBoolVector() {
     beginReadGenericVector();

diff --git a/src/CommonAPI/DBus/DBusInputStream.h b/src/CommonAPI/DBus/DBusInputStream.h
index 5b9ed71..1c54aca 100644 (file)
--- a/src/CommonAPI/DBus/DBusInputStream.h
+++ b/src/CommonAPI/DBus/DBusInputStream.h
@@ -68,6 +68,8 @@ class DBusInputStream: public InputStream {
        virtual void beginReadSerializableStruct(const SerializableStruct& serializableStruct);
        virtual void endReadSerializableStruct(const SerializableStruct& serializableStruct);
 
+    virtual void readSerializableVariant(SerializableVariant& serializableVariant);
+
     virtual void beginReadBoolVector();
     virtual void beginReadInt8Vector();
     virtual void beginReadInt16Vector();
@@ -190,6 +192,12 @@ class DBusInputStream: public InputStream {
         bytesToRead_.push(vectorByteSize);
     }
 
+    inline void skipOverSignature() {
+        uint8_t length;
+        readValue(length);
+        assert(length < 256);
+    }
+
     char* dataBegin_;
     position_t currentDataPosition_;
     size_t dataLength_;

diff --git a/src/CommonAPI/DBus/DBusOutputStream.h b/src/CommonAPI/DBus/DBusOutputStream.h
index ca13fb2..928fc29 100644 (file)
--- a/src/CommonAPI/DBus/DBusOutputStream.h
+++ b/src/CommonAPI/DBus/DBusOutputStream.h
@@ -411,7 +411,7 @@ class DBusOutputStream: public OutputStream {
         writeBasicTypeValue((uint32_t) 0);
     }
 
-    inline void writeSignature(std::string signature) {
+    inline void writeSignature(const std::string& signature) {
         uint8_t length = (uint8_t) signature.length();
         assert(length < 256);
         *this << length;