From 32caf7f1db12965712a1f74016e7b55e258cab73 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Wed, 25 Sep 2013 15:42:47 +0200 Subject: * made sure that CommonAPI stuff compiles with release 2.1 Signed-off-by: Christian Linke --- .../NodeStateManager/LifeCycleConsumerProxy.h | 65 +++++++++++++++++----- 1 file changed, 50 insertions(+), 15 deletions(-) (limited to 'AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h') diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h index 9289e83..8180d71 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h @@ -1,16 +1,32 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_ #include "LifeCycleConsumerProxyBase.h" +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #undef COMMONAPI_INTERNAL_COMPILATION @@ -27,16 +43,14 @@ class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public L - /** * Calls LifecycleRequest with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -50,22 +64,38 @@ class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public L * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback); + - /// Returns the CommonAPI address of the remote partner this proxy communicates with. + /** + * Returns the CommonAPI address of the remote partner this proxy communicates with. + */ virtual std::string getAddress() const; - /// Returns the domain of the remote partner this proxy communicates with. + /** + * Returns the domain of the remote partner this proxy communicates with. + */ virtual const std::string& getDomain() const; - /// Returns the service ID of the remote partner this proxy communicates with. + /** + * Returns the service ID of the remote partner this proxy communicates with. + */ virtual const std::string& getServiceId() const; - /// Returns the instance ID of the remote partner this proxy communicates with. + /** + * Returns the instance ID of the remote partner this proxy communicates with. + */ virtual const std::string& getInstanceId() const; - /// Returns true if the remote partner for this proxy is available. + /** + * Returns true if the remote partner for this proxy is currently known to be available. + */ virtual bool isAvailable() const; + /** + * Returns true if the remote partner for this proxy is available. + */ + virtual bool isAvailableBlocking() const; + /** * Returns the wrapper class that is used to (de-)register for notifications about * the availability of the remote partner of this proxy. @@ -106,7 +136,6 @@ std::future LifeCycleConsumerProxy<_AttributeExtensions.. return delegate_->LifecycleRequestAsync(Request, RequestId, callback); } - template std::string LifeCycleConsumerProxy<_AttributeExtensions...>::getAddress() const { return delegate_->getAddress(); @@ -132,6 +161,11 @@ bool LifeCycleConsumerProxy<_AttributeExtensions...>::isAvailable() const { return delegate_->isAvailable(); } +template +bool LifeCycleConsumerProxy<_AttributeExtensions...>::isAvailableBlocking() const { + return delegate_->isAvailableBlocking(); +} + template CommonAPI::ProxyStatusEvent& LifeCycleConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() { return delegate_->getProxyStatusEvent(); @@ -142,10 +176,11 @@ CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtension return delegate_->getInterfaceVersionAttribute(); } + + } // namespace NodeStateManager } // namespace genivi } // namespace org - #endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_ -- cgit v1.2.1