1 files changed, 19 insertions, 19 deletions
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
index dfda3aa..9fc6c40 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* Used org.genivi.commonapi.core 3.1.2.v201507021046.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -43,42 +43,42 @@ void RootInterfaceStubDefault::testRootMethod(const std::shared_ptr<CommonAPI::C
 bool RootInterfaceStubDefault::registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<LeafInterfaceStub> _stub) {
     autoInstanceCounter_++;
     std::stringstream ss;
-    ss << stubAdapter_->getAddress().getInstance() << ".i" << autoInstanceCounter_;
+    ss << CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getAddress().getInstance() << ".i" << autoInstanceCounter_;
     std::string instance = ss.str();
-    assert(stubAdapter_ !=NULL);
-    return stubAdapter_->registerManagedStubLeafInterface(_stub, instance);
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubLeafInterface(_stub, instance);
 }
 bool RootInterfaceStubDefault::registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub> _stub, const std::string &_instance) {
-	assert(stubAdapter_ !=NULL);
-    return stubAdapter_->registerManagedStubLeafInterface(_stub, _instance);
+	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubLeafInterface(_stub, _instance);
 }
 bool RootInterfaceStubDefault::deregisterManagedStubLeafInterface(const std::string &_instance) {
-	assert(stubAdapter_ !=NULL);
-    return stubAdapter_->deregisterManagedStubLeafInterface(_instance);
+	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->deregisterManagedStubLeafInterface(_instance);
 }
 std::set<std::string>& RootInterfaceStubDefault::getLeafInterfaceInstances() {
-	assert(stubAdapter_ !=NULL);
-    return stubAdapter_->getLeafInterfaceInstances();
+	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getLeafInterfaceInstances();
 }
 bool RootInterfaceStubDefault::registerManagedStubBranchInterfaceAutoInstance(std::shared_ptr<BranchInterfaceStub> _stub) {
     autoInstanceCounter_++;
     std::stringstream ss;
-    ss << stubAdapter_->getAddress().getInstance() << ".i" << autoInstanceCounter_;
+    ss << CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getAddress().getInstance() << ".i" << autoInstanceCounter_;
     std::string instance = ss.str();
-    assert(stubAdapter_ !=NULL);
-    return stubAdapter_->registerManagedStubBranchInterface(_stub, instance);
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubBranchInterface(_stub, instance);
 }
 bool RootInterfaceStubDefault::registerManagedStubBranchInterface(std::shared_ptr<BranchInterfaceStub> _stub, const std::string &_instance) {
-	assert(stubAdapter_ !=NULL);
-    return stubAdapter_->registerManagedStubBranchInterface(_stub, _instance);
+	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubBranchInterface(_stub, _instance);
 }
 bool RootInterfaceStubDefault::deregisterManagedStubBranchInterface(const std::string &_instance) {
-	assert(stubAdapter_ !=NULL);
-    return stubAdapter_->deregisterManagedStubBranchInterface(_instance);
+	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->deregisterManagedStubBranchInterface(_instance);
 }
 std::set<std::string>& RootInterfaceStubDefault::getBranchInterfaceInstances() {
-	assert(stubAdapter_ !=NULL);
-    return stubAdapter_->getBranchInterfaceInstances();
+	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
+    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getBranchInterfaceInstances();
 }
 
 RootInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(RootInterfaceStubDefault *_defaultStub)