capicxx-someip-tools 3.1.12.1

COVESA · Jan 25, 2018 · 090d7c5 · 090d7c5
1 parent 9d8e4cb
commit 090d7c5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 64 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,9 @@
 Changes
 =======
 
+v3.1.12.1
+- support 'lock functors' in AttributeDispatcher(s)
+
 v3.1.12
 - Improve deployment validator
 - Support inline array deployments

diff --git a/...meip/src/org/genivi/commonapi/someip/generator/FInterfaceSomeIPStubAdapterGenerator.xtend b/...meip/src/org/genivi/commonapi/someip/generator/FInterfaceSomeIPStubAdapterGenerator.xtend
@@ -242,7 +242,7 @@ class FInterfaceSomeIPStubAdapterGenerator {
         CommonAPI::SomeIP::GetAttributeStubDispatcher<
             «_interface.stubFullClassName»,
             CommonAPI::Version
-            > «_interface.someipStubAdapterClassNameInternal»<_Stub, _Stubs...>::get«_interface.elementName»InterfaceVersionStubDispatcher(&«_interface.stubClassName»::getInterfaceVersion, false);
+            > «_interface.someipStubAdapterClassNameInternal»<_Stub, _Stubs...>::get«_interface.elementName»InterfaceVersionStubDispatcher(&«_interface.stubClassName»::lockInterfaceVersionAttribute, &«_interface.stubClassName»::getInterfaceVersion, false);
 
         «FOR attribute : _interface.attributes»
             «generateAttributeDispatcherDefinitions(attribute, _interface, _accessor)»
@@ -531,6 +531,7 @@ class FInterfaceSomeIPStubAdapterGenerator {
                 «typeName»«IF deploymentType != "CommonAPI::EmptyDeployment" && deploymentType != ""»,
                 «deploymentType»«ENDIF»
             > «_interface.someipStubAdapterClassNameInternal»<_Stub, _Stubs...>::«_attribute.someipGetStubDispatcherVariable»(
+                &«_interface.stubClassName»::«_attribute.stubClassLockMethodName»,
                 &«_interface.stubClassName»::«_attribute.stubClassGetMethodName», «_attribute.getEndianess(_accessor)»«IF _accessor.hasDeployment(_attribute)», «_attribute.getDeploymentRef(_attribute.array, null, _interface, _accessor)»«ENDIF»);
             «ENDIF»
             «IF !_attribute.isReadonly»
@@ -540,6 +541,7 @@ class FInterfaceSomeIPStubAdapterGenerator {
                     «typeName»«IF deploymentType != "CommonAPI::EmptyDeployment" && deploymentType != ""»,
                     «deploymentType»«ENDIF»
                 > «_interface.someipStubAdapterClassNameInternal»<_Stub, _Stubs...>::«_attribute.someipSetStubDispatcherVariable»(
+                    &«_interface.stubClassName»::«_attribute.stubClassLockMethodName»,
                     &«_interface.stubClassName»::«_attribute.stubClassGetMethodName»,
                     &«_interface.stubRemoteEventClassName»::«_attribute.stubRemoteEventClassSetMethodName»,
                     &«_interface.stubRemoteEventClassName»::«_attribute.stubRemoteEventClassChangedMethodName»,