summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Freutsmiedl <Markus.Freutsmiedl@berner-mattner.com>2015-10-12 17:37:46 +0200
committerMarkus Freutsmiedl <Markus.Freutsmiedl@berner-mattner.com>2015-10-12 17:37:46 +0200
commit99b3b06cc43a6337ac0c5a8191ee20dd24c82847 (patch)
tree69dff1a7a2a703bcbe34d31e2ed68f7bd4669923
parent23a8adf5723d79f5ad75de4929129411340417c0 (diff)
downloadgenivi-common-api-runtime-99b3b06cc43a6337ac0c5a8191ee20dd24c82847.tar.gz
CommonAPI-Tools 3.1.3p43.1.3p4
-rw-r--r--org.genivi.commonapi.console/about.mappings4
-rw-r--r--org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FInterfaceProxyGenerator.xtend4
2 files changed, 4 insertions, 4 deletions
diff --git a/org.genivi.commonapi.console/about.mappings b/org.genivi.commonapi.console/about.mappings
index b80ace9..dd6c31f 100644
--- a/org.genivi.commonapi.console/about.mappings
+++ b/org.genivi.commonapi.console/about.mappings
@@ -1,3 +1,3 @@
-0=3.1.3-p3
-1=20151001
+0=3.1.3-p4
+1=20151012
2=$sun.arch.data.model$
diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FInterfaceProxyGenerator.xtend b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FInterfaceProxyGenerator.xtend
index 041e64e..b34b061 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FInterfaceProxyGenerator.xtend
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FInterfaceProxyGenerator.xtend
@@ -157,8 +157,8 @@ class FInterfaceProxyGenerator {
class «fInterface.proxyClassName»
: virtual public «fInterface.elementName»,
virtual public «fInterface.proxyBaseClassName»,«IF fInterface.base != null»
- virtual public «fInterface.base.getTypeCollectionName(fInterface)»Proxy<_AttributeExtensions...>,«ENDIF»
- public _AttributeExtensions... {
+ public «fInterface.base.getTypeCollectionName(fInterface)»Proxy<_AttributeExtensions...>,«ENDIF»
+ virtual public _AttributeExtensions... {
public:
«fInterface.proxyClassName»(std::shared_ptr<CommonAPI::Proxy> delegate);
~«fInterface.proxyClassName»();