From edc77187278eeb7e45310de51f0f58bc56689b11 Mon Sep 17 00:00:00 2001 From: Michael Bentley Date: Thu, 22 Aug 2024 16:52:02 -0600 Subject: [PATCH] Rename IOX_CLASS -> IOX_C_CLASS --- iceoryx_binding_c/include/iceoryx_binding_c/client.h | 2 +- .../include/iceoryx_binding_c/internal/c2cpp_binding.h | 4 ++-- iceoryx_binding_c/include/iceoryx_binding_c/listener.h | 2 +- .../include/iceoryx_binding_c/notification_info.h | 2 +- iceoryx_binding_c/include/iceoryx_binding_c/request_header.h | 4 ++-- iceoryx_binding_c/include/iceoryx_binding_c/response_header.h | 4 ++-- iceoryx_binding_c/include/iceoryx_binding_c/server.h | 2 +- .../include/iceoryx_binding_c/service_discovery.h | 2 +- iceoryx_binding_c/include/iceoryx_binding_c/user_trigger.h | 2 +- iceoryx_binding_c/include/iceoryx_binding_c/wait_set.h | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/client.h b/iceoryx_binding_c/include/iceoryx_binding_c/client.h index 314ebe00c4..cf43ef3b98 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/client.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/client.h @@ -23,7 +23,7 @@ #include "iceoryx_binding_c/types.h" /// @brief client handle -typedef IOX_CLASS UntypedClient* iox_client_t; +typedef IOX_C_CLASS UntypedClient* iox_client_t; /// @brief options to be set for a client typedef struct diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_binding.h b/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_binding.h index a30a218441..787a632a45 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_binding.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_binding.h @@ -21,14 +21,14 @@ #include -#define IOX_CLASS class +#define IOX_C_CLASS class #else #include #include -#define IOX_CLASS struct +#define IOX_C_CLASS struct #endif diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/listener.h b/iceoryx_binding_c/include/iceoryx_binding_c/listener.h index 88e337533b..7f180036fb 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/listener.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/listener.h @@ -26,7 +26,7 @@ #include "iceoryx_binding_c/types.h" #include "iceoryx_binding_c/user_trigger.h" -typedef IOX_CLASS Listener* iox_listener_t; +typedef IOX_C_CLASS Listener* iox_listener_t; /// @brief initializes a listener struct from a storage struct pointer diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/notification_info.h b/iceoryx_binding_c/include/iceoryx_binding_c/notification_info.h index bc98698dcd..b807ba0cce 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/notification_info.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/notification_info.h @@ -25,7 +25,7 @@ #include "iceoryx_binding_c/user_trigger.h" /// @brief notification info handle -typedef const IOX_CLASS NotificationInfo* iox_notification_info_t; +typedef const IOX_C_CLASS NotificationInfo* iox_notification_info_t; /// @brief returns the id of the notification /// @param[in] self handle to notification info diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/request_header.h b/iceoryx_binding_c/include/iceoryx_binding_c/request_header.h index 3af3d01219..9da02e7269 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/request_header.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/request_header.h @@ -21,10 +21,10 @@ #include "iceoryx_binding_c/internal/c2cpp_binding.h" /// @brief request header handle -typedef IOX_CLASS RequestHeader* iox_request_header_t; +typedef IOX_C_CLASS RequestHeader* iox_request_header_t; /// @brief const request header handle -typedef const IOX_CLASS RequestHeader* iox_const_request_header_t; +typedef const IOX_C_CLASS RequestHeader* iox_const_request_header_t; /// @brief extract the request header from a given payload /// @param[in] payload the pointer to the payload diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/response_header.h b/iceoryx_binding_c/include/iceoryx_binding_c/response_header.h index 51610dda81..344f67c9d1 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/response_header.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/response_header.h @@ -21,10 +21,10 @@ #include "iceoryx_binding_c/internal/c2cpp_binding.h" /// @brief response header handle -typedef IOX_CLASS ResponseHeader* iox_response_header_t; +typedef IOX_C_CLASS ResponseHeader* iox_response_header_t; /// @brief const response header handle -typedef const IOX_CLASS ResponseHeader* iox_const_response_header_t; +typedef const IOX_C_CLASS ResponseHeader* iox_const_response_header_t; /// @brief extract the response header from a given payload /// @param[in] payload the pointer to the payload diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/server.h b/iceoryx_binding_c/include/iceoryx_binding_c/server.h index ce596e9087..5f5d484390 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/server.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/server.h @@ -23,7 +23,7 @@ #include "iceoryx_binding_c/types.h" /// @brief server handle -typedef IOX_CLASS UntypedServer* iox_server_t; +typedef IOX_C_CLASS UntypedServer* iox_server_t; /// @brief options to be set for a server typedef struct diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/service_discovery.h b/iceoryx_binding_c/include/iceoryx_binding_c/service_discovery.h index aeef820f5a..7ddae5c2af 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/service_discovery.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/service_discovery.h @@ -23,7 +23,7 @@ #include "service_description.h" /// @brief service discovery handle -typedef IOX_CLASS ServiceDiscovery* iox_service_discovery_t; +typedef IOX_C_CLASS ServiceDiscovery* iox_service_discovery_t; /// @brief initializes a service discovery from a storage struct pointer /// @param[in] self pointer to raw memory which can hold a service discovery diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/user_trigger.h b/iceoryx_binding_c/include/iceoryx_binding_c/user_trigger.h index 6a50bb4cdb..edc184cba3 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/user_trigger.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/user_trigger.h @@ -22,7 +22,7 @@ #include "iceoryx_binding_c/types.h" /// @brief user trigger handle -typedef IOX_CLASS UserTrigger* iox_user_trigger_t; +typedef IOX_C_CLASS UserTrigger* iox_user_trigger_t; /// @brief initialize user trigger handle /// @param[in] self pointer to preallocated memory of size = sizeof(iox_user_trigger_storage_t) diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/wait_set.h b/iceoryx_binding_c/include/iceoryx_binding_c/wait_set.h index 5257bd1b18..e767862b5a 100644 --- a/iceoryx_binding_c/include/iceoryx_binding_c/wait_set.h +++ b/iceoryx_binding_c/include/iceoryx_binding_c/wait_set.h @@ -30,7 +30,7 @@ #include /// @brief wait set handle -typedef IOX_CLASS cpp2c_WaitSet* iox_ws_t; +typedef IOX_C_CLASS cpp2c_WaitSet* iox_ws_t; /// @brief initialize wait set handle /// @param[in] self pointer to preallocated memory of size = sizeof(iox_ws_storage_t)