summaryrefslogtreecommitdiff
path: root/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
diff options
context:
space:
mode:
authorStefan Laner <laner@itestra.de>2013-11-23 01:14:27 +0100
committerPhilip Rauwolf <rauwolf@itestra.de>2013-11-27 14:59:35 +0100
commit8c6ed83e31ac977224da0fd0763c173e16b5f858 (patch)
treeaa3c46e1478ed2fd8de8e783804cfcdc8aa2c72c /src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
parente6460a44e88ceb584d920e86550a725491965d7a (diff)
downloadgenivi-common-api-dbus-runtime-8c6ed83e31ac977224da0fd0763c173e16b5f858.tar.gz
Fix for inherited interfaces and tests for that including generated code
Diffstat (limited to 'src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h')
-rw-r--r--src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h b/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
index fdedc9c..e9227b8 100644
--- a/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
+++ b/src/test/commonapi/tests/managed/LeafInterfaceStubDefault.h
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* 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.
@@ -10,6 +10,7 @@
#ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_H_
#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_H_
+
#include <commonapi/tests/managed/LeafInterfaceStub.h>
#include <sstream>
@@ -27,8 +28,8 @@ namespace managed {
* that would be defined for this service, and/or if you do not need any non-default
* behaviour.
*/
-class LeafInterfaceStubDefault : public LeafInterfaceStub {
- public:
+class LeafInterfaceStubDefault : public virtual LeafInterfaceStub {
+public:
LeafInterfaceStubDefault();
LeafInterfaceStubRemoteEvent* initStubAdapter(const std::shared_ptr<LeafInterfaceStubAdapter>& stubAdapter);
@@ -40,9 +41,8 @@ class LeafInterfaceStubDefault : public LeafInterfaceStub {
- protected:
- std::shared_ptr<LeafInterfaceStubAdapter> stubAdapter_;
- private:
+protected:
+private:
class RemoteEventHandler: public LeafInterfaceStubRemoteEvent {
public:
RemoteEventHandler(LeafInterfaceStubDefault* defaultStub);