From 49195df6bbd8817c6d1bed7a8018b226fcadd18c Mon Sep 17 00:00:00 2001
From: Philip Rauwolf <rauwolf@itestra.de>
Date: Tue, 15 Jan 2013 15:59:05 +0100
Subject: [PATCH] Fixed compile time error

---
 src/CommonAPI/DBus/DBusOutputStream.h | 244 +++++++++++++++++-----------------
 1 file changed, 123 insertions(+), 121 deletions(-)

diff --git a/src/CommonAPI/DBus/DBusOutputStream.h b/src/CommonAPI/DBus/DBusOutputStream.h
index b918cf8..35fdea5 100644
--- a/src/CommonAPI/DBus/DBusOutputStream.h
+++ b/src/CommonAPI/DBus/DBusOutputStream.h
@@ -17,17 +17,135 @@
 #include <vector>
 #include <cassert>
 #include <stack>
+#include <memory>
 
 namespace CommonAPI {
 namespace DBus {
 
+
+class DBusTypeOutputStream: public TypeOutputStream {
+  public:
+    DBusTypeOutputStream(): signature_("") {
+
+    }
+    virtual ~DBusTypeOutputStream() {}
+
+
+    inline virtual void writeBoolType() {
+        signature_.append("b");
+    }
+
+    inline virtual void writeInt8Type()  {
+        signature_.append("y");
+    }
+    inline virtual void writeInt16Type()  {
+        signature_.append("n");
+    }
+    inline virtual void writeInt32Type()  {
+        signature_.append("i");
+    }
+    inline virtual void writeInt64Type()  {
+        signature_.append("x");
+    }
+
+    inline virtual void writeUInt8Type()  {
+        signature_.append("y");
+    }
+    inline virtual void writeUInt16Type()  {
+        signature_.append("q");
+    }
+    inline virtual void writeUInt32Type()  {
+        signature_.append("u");
+    }
+    inline virtual void writeUInt64Type()  {
+        signature_.append("t");
+    }
+
+
+    inline virtual void writeInt8EnumType()  {
+        signature_.append("y");
+    }
+    inline virtual void writeInt16EnumType()  {
+        signature_.append("n");
+    }
+    inline virtual void writeInt32EnumType()  {
+        signature_.append("i");
+    }
+    inline virtual void writeInt64EnumType()  {
+        signature_.append("x");
+    }
+
+    inline virtual void writeUInt8EnumType()  {
+        signature_.append("y");
+    }
+    inline virtual void writeUInt16EnumType()  {
+        signature_.append("n");
+    }
+    inline virtual void writeUInt32EnumType()  {
+        signature_.append("u");
+    }
+    inline virtual void writeUInt64EnumType()  {
+        signature_.append("t");
+    }
+
+
+    inline virtual void writeFloatType()  {
+        signature_.append("d");
+    }
+    inline virtual void writeDoubleType()  {
+        signature_.append("d");
+    }
+
+    inline virtual void writeStringType()  {
+        signature_.append("s");
+    }
+    inline virtual void writeByteBufferType()  {
+        signature_.append("ay");
+    }
+    inline virtual void writeVersionType()  {
+        signature_.append("(uu)");
+    }
+
+    inline virtual void beginWriteStructType()  {
+        signature_.append("(");
+    }
+    inline virtual void endWriteStructType() {
+        signature_.append(")");
+    }
+
+    inline virtual void beginWriteMapType()  {
+        signature_.append("a{");
+    }
+    inline virtual void endWriteMapType() {
+        signature_.append("}");
+    }
+
+    inline virtual void beginWriteVectorType()  {
+        signature_.append("a");
+    }
+
+    inline virtual void endWriteVectorType()  {
+    }
+
+    inline virtual void writeVariantType()  {
+        signature_.append("v");
+    }
+
+    inline virtual std::string retrieveSignature() {
+        return std::move(signature_);
+    }
+
+
+  private:
+    std::string signature_;
+};
+
+
 /**
  * Used to mark the position of a pointer within an array of bytes.
  */
 typedef uint32_t position_t;
 
-class DBusVariantOutputStream;
-
 
 /**
  * @class DBusOutputMessageStream
@@ -159,6 +277,9 @@ class DBusOutputStream: public OutputStream {
  	virtual void beginWriteSerializableStruct(const SerializableStruct& serializableStruct) { alignToBoundary(8); }
 	virtual void endWriteSerializableStruct(const SerializableStruct& serializableStruct) { }
 
+    virtual void beginWriteSerializableVariant(const SerializableVariant& serializableVariant) { }
+    virtual void endWriteSerializableVariant(const SerializableVariant& serializableVariant) { }
+
 	virtual void beginWriteMap(size_t elementCount) {
         alignToBoundary(sizeof(uint32_t));
         rememberCurrentStreamPosition();
@@ -358,125 +479,6 @@ OutputStream& DBusOutputStream::writeValue(const ByteBuffer& byteBufferValue) {
 }
 
 
-
-class DBusTypeOutputStream: public TypeOutputStream {
-  public:
-    DBusTypeOutputStream(): signature_("") {
-
-    }
-    virtual ~DBusTypeOutputStream() {}
-
-
-    inline virtual void writeBoolType() {
-        signature_.append("b");
-    }
-
-    inline virtual void writeInt8Type()  {
-        signature_.append("y");
-    }
-    inline virtual void writeInt16Type()  {
-        signature_.append("n");
-    }
-    inline virtual void writeInt32Type()  {
-        signature_.append("i");
-    }
-    inline virtual void writeInt64Type()  {
-        signature_.append("x");
-    }
-
-    inline virtual void writeUInt8Type()  {
-        signature_.append("y");
-    }
-    inline virtual void writeUInt16Type()  {
-        signature_.append("q");
-    }
-    inline virtual void writeUInt32Type()  {
-        signature_.append("u");
-    }
-    inline virtual void writeUInt64Type()  {
-        signature_.append("t");
-    }
-
-
-    inline virtual void writeInt8EnumType()  {
-        signature_.append("y");
-    }
-    inline virtual void writeInt16EnumType()  {
-        signature_.append("n");
-    }
-    inline virtual void writeInt32EnumType()  {
-        signature_.append("i");
-    }
-    inline virtual void writeInt64EnumType()  {
-        signature_.append("x");
-    }
-
-    inline virtual void writeUInt8EnumType()  {
-        signature_.append("y");
-    }
-    inline virtual void writeUInt16EnumType()  {
-        signature_.append("n");
-    }
-    inline virtual void writeUInt32EnumType()  {
-        signature_.append("u");
-    }
-    inline virtual void writeUInt64EnumType()  {
-        signature_.append("t");
-    }
-
-
-    inline virtual void writeFloatType()  {
-        signature_.append("d");
-    }
-    inline virtual void writeDoubleType()  {
-        signature_.append("d");
-    }
-
-    inline virtual void writeStringType()  {
-        signature_.append("s");
-    }
-    inline virtual void writeByteBufferType()  {
-        signature_.append("ay");
-    }
-    inline virtual void writeVersionType()  {
-        signature_.append("(uu)");
-    }
-
-    inline virtual void beginWriteStructType()  {
-        signature_.append("(");
-    }
-    inline virtual void endWriteStructType() {
-        signature_.append(")");
-    }
-
-    inline virtual void beginWriteMapType()  {
-        signature_.append("a{");
-    }
-    inline virtual void endWriteMapType() {
-        signature_.append("}");
-    }
-
-    inline virtual void beginWriteVectorType()  {
-        signature_.append("a");
-    }
-
-    inline virtual void endWriteVectorType()  {
-    }
-
-    inline virtual void writeVariantType()  {
-        signature_.append("v");
-    }
-
-    inline virtual std::string retrieveSignature() {
-        return std::move(signature_);
-    }
-
-
-  private:
-    std::string signature_;
-};
-
-
 } // namespace DBus
 } // namespace CommonAPI
 
-- 
2.7.4