Fix build break issue

 - One Definition Rule [-Werror=odr]

Change-Id: I6094e0f334b80be596503b23f9e5a097fefbae39
Signed-off-by: jusung <jusung07.son@samsung.com>

diff --git a/idlc/gen_aitt_plugin/aitt_plugin_c_transportable.cc b/idlc/gen_aitt_plugin/aitt_plugin_c_transportable.cc
index bb70f2b..80d8a5c 100644 (file)
--- a/idlc/gen_aitt_plugin/aitt_plugin_c_transportable.cc
+++ b/idlc/gen_aitt_plugin/aitt_plugin_c_transportable.cc
@@ -1035,7 +1035,7 @@ std::string AittPluginCTransportable::GenGroupType() const {
 
 std::string AittPluginCTransportable::GenPayloadTransferStatusType(bool internal_type) const {
   if (internal_type)
-    return "transfer_status_e";
+    return "<INTERNAL_PREFIX>_transfer_status_e";
   else
     return "<MODULE_PREFIX>_payload_transfer_status_e";
 }

diff --git a/idlc/gen_aitt_plugin/aitt_plugin_cpp_transportable.cc b/idlc/gen_aitt_plugin/aitt_plugin_cpp_transportable.cc
index 80753d3..b0f1316 100644 (file)
--- a/idlc/gen_aitt_plugin/aitt_plugin_cpp_transportable.cc
+++ b/idlc/gen_aitt_plugin/aitt_plugin_cpp_transportable.cc
@@ -90,7 +90,7 @@ R"__cpp_cb(<SERVER_T> server;
 
   ret = <INTERNAL_PREFIX>_server_add_payload_received_cb(server,
       [](const char *service_name, const <INTERNAL_PREFIX>_peer_info_h peer_info,
-        const <INTERNAL_PREFIX>_payload_h payload, transfer_status_e status, void *user_data) {
+        const <INTERNAL_PREFIX>_payload_h payload, <INTERNAL_PREFIX>_transfer_status_e status, void *user_data) {
             ## *sr = static_cast<##*>(user_data);
             sr->OnPayloadReceivedCB(service_name, peer_info, payload,
                 static_cast<<MODULE_PREFIX>_payload_transfer_status_e>(status), user_data);
@@ -323,7 +323,7 @@ R"__c_cb(<CLIENT_T> client = nullptr;
 
   ret = <INTERNAL_PREFIX>_client_add_payload_received_cb(client,
       [](const char *service_name, const <INTERNAL_PREFIX>_peer_info_h peer_info,
-        const <INTERNAL_PREFIX>_payload_h payload, transfer_status_e status, void *user_data) {
+        const <INTERNAL_PREFIX>_payload_h payload, <INTERNAL_PREFIX>_transfer_status_e status, void *user_data) {
             $$ *sr = static_cast<$$*>(user_data);
             sr->OnPayloadReceivedCB(service_name, peer_info, payload,
                 static_cast<<MODULE_PREFIX>_payload_transfer_status_e>(status), user_data);
@@ -465,7 +465,7 @@ R"__c_cb(
 /**
  * @brief Enumeration for <MODULE_PREFIX>_payload transfer status types.
  */
-typedef enum _payload_transfer_status_e {
+typedef enum _<MODULE_PREFIX>_payload_transfer_status_e {
   AITT_PLUGIN_PAYLOAD_TRANSFER_STATUS_SUCCESS, /**< Transfer is success **/
   AITT_PLUGIN_PAYLOAD_TRANSFER_STATUS_FAILURE, /**< Transfer is failed **/
   AITT_PLUGIN_PAYLOAD_TRANSFER_STATUS_IN_PROGRESS, /**< Transfer is in progress **/
@@ -997,7 +997,7 @@ std::string AittPluginCppTransportable::GenGroupType() const {
 
 std::string AittPluginCppTransportable::GenPayloadTransferStatusType(bool internal_type) const {
   if (internal_type)
-    return "transfer_status_e";
+    return "<INTERNAL_PREFIX>_transfer_status_e";
   else
     return "<MODULE_PREFIX>_payload_transfer_status_e";
 }

diff --git a/idlc/gen_aitt_plugin/aitt_plugin_internal_header_gen_cb.h b/idlc/gen_aitt_plugin/aitt_plugin_internal_header_gen_cb.h
index 3b75382..e5749b1 100644 (file)
--- a/idlc/gen_aitt_plugin/aitt_plugin_internal_header_gen_cb.h
+++ b/idlc/gen_aitt_plugin/aitt_plugin_internal_header_gen_cb.h
@@ -31,18 +31,18 @@ R"__c_cb(
 extern "C" {
 #endif
 
-typedef enum _transfer_status_e {
+typedef enum _<PREFIX>_transfer_status_e {
   SUCCESS, /**< Transfer is success **/
   FAILURE, /**< Transfer is failed **/
   IN_PROGRESS, /**< Transfer is in progress **/
-} transfer_status_e;
+} <PREFIX>_transfer_status_e;
 
-typedef enum _payload_type_e {
+typedef enum _<PREFIX>_payload_type_e {
   AITT_PLUGIN_PAYLOAD_TYPE_DATA, /**< Data type payload **/
   AITT_PLUGIN_PAYLOAD_TYPE_FILE, /**< File type payload **/
 } <PREFIX>_payload_type_e;
 
-typedef enum _connection_status_e {
+typedef enum _<PREFIX>_connection_status_e {
   CONNECTION_STATUS_OK, /**< Connection is ok **/
   CONNECTION_STATUS_REJECTED, /**< Connection is rejected **/
   CONNECTION_STATUS_ERROR, /**< Connection error occurs **/
@@ -66,7 +66,7 @@ typedef void (*<PREFIX>_server_connection_result_cb)(
     const <PREFIX>_connection_result_h result, void *user_data);
 typedef void (*<PREFIX>_server_payload_received_cb)(const char *service_name,
     const <PREFIX>_peer_info_h peer_info, const <PREFIX>_payload_h payload,
-    transfer_status_e status, void *user_data);
+    <PREFIX>_transfer_status_e status, void *user_data);
 typedef void (*<PREFIX>_server_connection_request_cb)(const char *service_name,
     const <PREFIX>_peer_info_h peer_info, void *user_data);
 typedef void (*<PREFIX>_server_disconnected_cb)(const char *service_name,
@@ -108,7 +108,7 @@ typedef void (*<PREFIX>_client_payload_async_result_cb)(
     const <PREFIX>_payload_async_result_h result, void *user_data);
 typedef void (*<PREFIX>_client_payload_received_cb)(const char *service_name,
     const <PREFIX>_peer_info_h peer_info, const <PREFIX>_payload_h payload,
-    transfer_status_e status, void *user_data);
+    <PREFIX>_transfer_status_e status, void *user_data);
 typedef void (*<PREFIX>_client_disconnected_cb)(const char *service_name,
     const <PREFIX>_peer_info_h peer_info, void *user_data);
 )__c_cb";