Merged fix for inherited interfaces and version attribute. Regenerated

code.

Change-Id: I555557d42f1849d6ac517b24b88c974f3d1536ae

1 files changed, 38 insertions, 8 deletions

diff --git a/src/test/fake/legacy/service/LegacyInterfaceDBusStubAdapter.h b/src/test/fake/legacy/service/LegacyInterfaceDBusStubAdapter.h
index 0337006..e5c5894 100644
--- a/src/test/fake/legacy/service/LegacyInterfaceDBusStubAdapter.h
+++ b/src/test/fake/legacy/service/LegacyInterfaceDBusStubAdapter.h
@@ -1,6 +1,6 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.4.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -29,9 +29,9 @@ namespace service {
 
 typedef CommonAPI::DBus::DBusStubAdapterHelper<LegacyInterfaceStub> LegacyInterfaceDBusStubAdapterHelper;
 
-class LegacyInterfaceDBusStubAdapter: public LegacyInterfaceStubAdapter, public LegacyInterfaceDBusStubAdapterHelper {
+class LegacyInterfaceDBusStubAdapterInternal: public LegacyInterfaceStubAdapter, public LegacyInterfaceDBusStubAdapterHelper {
  public:
-    LegacyInterfaceDBusStubAdapter(
+    LegacyInterfaceDBusStubAdapterInternal(
             const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
             const std::string& commonApiAddress,
             const std::string& dbusInterfaceName,
@@ -40,19 +40,49 @@ class LegacyInterfaceDBusStubAdapter: public LegacyInterfaceStubAdapter, public
             const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
             const std::shared_ptr<CommonAPI::StubBase>& stub);
 
-    ~LegacyInterfaceDBusStubAdapter();
+    ~LegacyInterfaceDBusStubAdapterInternal();
 
 
-    
 
-    const StubDispatcherTable& getStubDispatcherTable();
-    
+
+    const LegacyInterfaceDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
     void deactivateManagedInstances();
 
+
  protected:
     virtual const char* getMethodsDBusIntrospectionXmlData() const;
     
   private:
+    LegacyInterfaceDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class LegacyInterfaceDBusStubAdapter: public LegacyInterfaceDBusStubAdapterInternal, public std::enable_shared_from_this<LegacyInterfaceDBusStubAdapter> {
+public:
+    LegacyInterfaceDBusStubAdapter(
+                         const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+                         const std::string& commonApiAddress,
+                         const std::string& dbusInterfaceName,
+                         const std::string& dbusBusName,
+                         const std::string& dbusObjectPath,
+                         const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+                         const std::shared_ptr<CommonAPI::StubBase>& stub) :
+            CommonAPI::DBus::DBusStubAdapter(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            false),
+            LegacyInterfaceDBusStubAdapterInternal(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            stub) { }
 };
 
 } // namespace service