From 00caae1e41e8891d9a1bafa76028e8119f06fd8a Mon Sep 17 00:00:00 2001
From: Aleksandar Donchev <aleksander.donchev@partner.bmw.de>
Date: Mon, 18 Aug 2014 10:24:58 +0200
Subject: * Common-API sources re-generated for 2.1.6

Signed-off-by: Christian Linke <christian.linke@bmw.de>
---
 .../src-gen/org/genivi/am/RoutingControlProxy.h    | 32 +++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h')

diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
index 4cc1ba0..a2721d3 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.genivi.commonapi.core 2.1.6.v20140519.
 * Used org.franca.core 0.8.11.201401091023.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -67,7 +67,7 @@ public:
     /**
      * connects a source to a sink
     (at)return E_OK on success, E_UNKNOWN on error,
-     *  E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
+     *  E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
      * 
      * Calls asyncConnect with synchronous semantics.
      * 
@@ -192,8 +192,8 @@ public:
     virtual std::future<CommonAPI::CallStatus> asyncSetSourceStateAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_SourceState_e& state, AsyncSetSourceStateAsyncCallback callback);
     /**
      * this function sets the sinksoundproperty.
-    (at)return E_OK on success,
-     *  E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
+    (at)return E_OK on success, E_UNKNOWN
+     *  on error, E_OUT_OF_RANGE in case the propery value is out of range
      * 
      * Calls asyncSetSinkSoundProperties with synchronous semantics.
      * 
@@ -216,8 +216,8 @@ public:
     virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertiesAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, AsyncSetSinkSoundPropertiesAsyncCallback callback);
     /**
      * this function sets the sinksoundproperty.
-    (at)return E_OK on success,
-     *  E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
+    (at)return E_OK on success, E_UNKNOWN
+     *  on error, E_OUT_OF_RANGE in case the propery value is out of range
      * 
      * Calls asyncSetSinkSoundProperty with synchronous semantics.
      * 
@@ -443,14 +443,20 @@ public:
     std::shared_ptr<RoutingControlProxyBase> delegate_;
 };
 
+#ifdef WIN32
+    typedef RoutingControlProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> RoutingControlProxyDefault;
+#else
+    typedef RoutingControlProxy<> RoutingControlProxyDefault;
+#endif
+
 
 //
 // RoutingControlProxy Implementation
 //
 template <typename ... _AttributeExtensions>
 RoutingControlProxy<_AttributeExtensions...>::RoutingControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
-        delegate_(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)),
-        _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)))... {
+        _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)))...,
+        delegate_(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)) {
 }
 
 template <typename ... _AttributeExtensions>
@@ -474,7 +480,7 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>:
 /**
  * connects a source to a sink
 (at)return E_OK on success, E_UNKNOWN on error,
- *  E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match
+ *  E_WRONG_FORMAT in case am_ConnectionFormat_e does not match
  */
 template <typename ... _AttributeExtensions>
 void RoutingControlProxy<_AttributeExtensions...>::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) {
@@ -549,8 +555,8 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>:
 }
 /**
  * this function sets the sinksoundproperty.
-(at)return E_OK on success,
- *  E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
+(at)return E_OK on success, E_UNKNOWN
+ *  on error, E_OUT_OF_RANGE in case the propery value is out of range
  */
 template <typename ... _AttributeExtensions>
 void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus) {
@@ -563,8 +569,8 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>:
 }
 /**
  * this function sets the sinksoundproperty.
-(at)return E_OK on success,
- *  E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range
+(at)return E_OK on success, E_UNKNOWN
+ *  on error, E_OUT_OF_RANGE in case the propery value is out of range
  */
 template <typename ... _AttributeExtensions>
 void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus) {
-- 
cgit v1.2.1