From a5f5a648f81ad9ab9acfe296f20f61baaa0d9593 Mon Sep 17 00:00:00 2001
From: Michael Bentley <mikebentley15@gmail.com>
Date: Mon, 19 Aug 2024 16:23:41 -0600
Subject: [PATCH] iox-#2327 Remove macro ENUM and rename macro CLASS to
IOX_C_CLASS
Signed-off-by: Michael Bentley <mikebentley15@gmail.com>
---
.../release-notes/iceoryx-unreleased.md | 1 +
.../include/iceoryx_binding_c/client.h | 19 +++--
.../internal/c2cpp_binding.h | 6 +-
.../internal/c2cpp_enum_translation.hpp | 4 +-
.../include/iceoryx_binding_c/listener.h | 46 +++++------
.../iceoryx_binding_c/notification_info.h | 2 +-
.../include/iceoryx_binding_c/publisher.h | 11 ++-
.../iceoryx_binding_c/request_header.h | 4 +-
.../iceoryx_binding_c/response_header.h | 4 +-
.../include/iceoryx_binding_c/server.h | 14 ++--
.../iceoryx_binding_c/service_discovery.h | 8 +-
.../include/iceoryx_binding_c/subscriber.h | 6 +-
.../include/iceoryx_binding_c/user_trigger.h | 2 +-
.../include/iceoryx_binding_c/wait_set.h | 76 +++++++++----------
.../source/c2cpp_enum_translation.cpp | 4 +-
iceoryx_binding_c/source/c_listener.cpp | 32 ++++----
.../source/c_service_discovery.cpp | 6 +-
iceoryx_binding_c/source/c_wait_set.cpp | 26 +++----
18 files changed, 134 insertions(+), 137 deletions(-)
diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
index 3aaeb3bbdd..51907665d3 100644
--- a/doc/website/release-notes/iceoryx-unreleased.md
+++ b/doc/website/release-notes/iceoryx-unreleased.md
@@ -68,6 +68,7 @@
**Bugfixes:**
+- Fix compile-time conflict with Apache Arrow [\#2327](https://github.com/eclipse-iceoryx/iceoryx/issues/2327)
- FreeBSD CI build is broken [\#1338](https://github.com/eclipse-iceoryx/iceoryx/issues/1338)
- High CPU load in blocked publisher is reduced by introducing smart busy loop waiting (adaptive_wait) [\#1347](https://github.com/eclipse-iceoryx/iceoryx/issues/1347)
- Compile Error : iceoryx_dds/Mempool.hpp: No such file or directory [\#1364](https://github.com/eclipse-iceoryx/iceoryx/issues/1364)
diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/client.h b/iceoryx_binding_c/include/iceoryx_binding_c/client.h
index 986414f09f..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 CLASS UntypedClient* iox_client_t;
+typedef IOX_C_CLASS UntypedClient* iox_client_t;
/// @brief options to be set for a client
typedef struct
@@ -38,10 +38,10 @@ typedef struct
bool connectOnCreate;
/// @brief Sets whether the server blocks when the client response queue is full
- ENUM iox_QueueFullPolicy responseQueueFullPolicy;
+ enum iox_QueueFullPolicy responseQueueFullPolicy;
/// @brief Sets whether the client blocks when the server request queue is full
- ENUM iox_ConsumerTooSlowPolicy serverTooSlowPolicy;
+ enum iox_ConsumerTooSlowPolicy serverTooSlowPolicy;
/// @brief this value will be set exclusively by 'iox_client_options_init' and is not supposed to be modified
/// otherwise
@@ -87,9 +87,8 @@ void iox_client_deinit(iox_client_t const self);
/// describes the error
/// @note for the user-payload alignment 'IOX_C_CHUNK_DEFAULT_USER_PAYLOAD_ALIGNMENT' is used
/// for a custom user-payload alignment please use 'iox_client_loan_aligned_request'
-ENUM iox_AllocationResult iox_client_loan_request(iox_client_t const self,
- void** const payload,
- const uint64_t payloadSize);
+enum iox_AllocationResult
+iox_client_loan_request(iox_client_t const self, void** const payload, const uint64_t payloadSize);
/// @brief allocates a request in the shared memory with a custom alignment for the user-payload
/// @param[in] self handle of the client
@@ -98,7 +97,7 @@ ENUM iox_AllocationResult iox_client_loan_request(iox_client_t const self,
/// @param[in] payloadAlignment user-payload alignment of the allocated request
/// @return on success it returns AllocationResult_SUCCESS otherwise a value which
/// describes the error
-ENUM iox_AllocationResult iox_client_loan_aligned_request(iox_client_t const self,
+enum iox_AllocationResult iox_client_loan_aligned_request(iox_client_t const self,
void** const payload,
const uint64_t payloadSize,
const uint32_t payloadAlignment);
@@ -114,7 +113,7 @@ void iox_client_release_request(iox_client_t const self, void* const payload);
/// @param[in] payload pointer to the user-payload of the request which should be send
/// @return on success it returns ClientSendResult_SUCCESS otherwise a value which
/// describes the error
-ENUM iox_ClientSendResult iox_client_send(iox_client_t const self, void* const payload);
+enum iox_ClientSendResult iox_client_send(iox_client_t const self, void* const payload);
/// @brief connects to the service
/// @param[in] self handle to the client
@@ -128,14 +127,14 @@ void iox_client_disconnect(iox_client_t const self);
/// @param[in] self handle to the client
/// @return ConnectionState_CONNECTED when successfully connected otherwise an enum which
/// describes the current state
-ENUM iox_ConnectionState iox_client_get_connection_state(iox_client_t const self);
+enum iox_ConnectionState iox_client_get_connection_state(iox_client_t const self);
/// @brief retrieve a received respone
/// @param[in] self handle to the client
/// @param[in] payload pointer in which the pointer to the user-payload of the response is stored
/// @return if a chunk could be received it returns ChunkReceiveResult_SUCCESS otherwise
/// an enum which describes the error
-ENUM iox_ChunkReceiveResult iox_client_take_response(iox_client_t const self, const void** const payload);
+enum iox_ChunkReceiveResult iox_client_take_response(iox_client_t const self, const void** const payload);
/// @brief release a previously acquired response (via iox_client_take_response)
/// @param[in] self handle to the client
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 02787ed9ae..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,16 +21,14 @@
#include <cstdint>
-#define CLASS class
-#define ENUM
+#define IOX_C_CLASS class
#else
#include <stdbool.h>
#include <stdint.h>
-#define CLASS struct
-#define ENUM enum
+#define IOX_C_CLASS struct
#endif
diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_enum_translation.hpp b/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_enum_translation.hpp
index 84ef057f0f..3b444d2eb3 100644
--- a/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_enum_translation.hpp
+++ b/iceoryx_binding_c/include/iceoryx_binding_c/internal/c2cpp_enum_translation.hpp
@@ -24,8 +24,8 @@
namespace c2cpp
{
-iox::popo::ConsumerTooSlowPolicy consumerTooSlowPolicy(const ENUM iox_ConsumerTooSlowPolicy policy) noexcept;
-iox::popo::QueueFullPolicy queueFullPolicy(const ENUM iox_QueueFullPolicy policy) noexcept;
+iox::popo::ConsumerTooSlowPolicy consumerTooSlowPolicy(const enum iox_ConsumerTooSlowPolicy policy) noexcept;
+iox::popo::QueueFullPolicy queueFullPolicy(const enum iox_QueueFullPolicy policy) noexcept;
iox::popo::SubscriberEvent subscriberEvent(const iox_SubscriberEvent value) noexcept;
iox::popo::SubscriberState subscriberState(const iox_SubscriberState value) noexcept;
diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/listener.h b/iceoryx_binding_c/include/iceoryx_binding_c/listener.h
index 6aca47663d..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 CLASS Listener* iox_listener_t;
+typedef IOX_C_CLASS Listener* iox_listener_t;
/// @brief initializes a listener struct from a storage struct pointer
@@ -44,9 +44,9 @@ void iox_listener_deinit(iox_listener_t const self);
/// @param[in] subscriberEvent the event which should trigger the listener
/// @param[in] callback the callback which is called when an event triggers the listener
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_subscriber_event(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_subscriber_event(iox_listener_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent,
+ const enum iox_SubscriberEvent subscriberEvent,
void (*callback)(iox_sub_t));
/// @brief Attaches a subscriber event to the listener. The callback has an additional contextData argument to provide
@@ -57,10 +57,10 @@ ENUM iox_ListenerResult iox_listener_attach_subscriber_event(iox_listener_t cons
/// @param[in] callback the callback which is called when an event triggers the listener
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult
+enum iox_ListenerResult
iox_listener_attach_subscriber_event_with_context_data(iox_listener_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent,
+ const enum iox_SubscriberEvent subscriberEvent,
void (*callback)(iox_sub_t, void*),
void* const contextData);
@@ -69,7 +69,7 @@ iox_listener_attach_subscriber_event_with_context_data(iox_listener_t const self
/// @param[in] userTrigger user trigger which emits the event
/// @param[in] callback the callback which is called when the user trigger triggers the listener
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_user_trigger_event(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_user_trigger_event(iox_listener_t const self,
iox_user_trigger_t const userTrigger,
void (*callback)(iox_user_trigger_t));
@@ -80,7 +80,7 @@ ENUM iox_ListenerResult iox_listener_attach_user_trigger_event(iox_listener_t co
/// @param[in] callback the callback which is called when the user trigger triggers the listener
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_user_trigger_event_with_context_data(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_user_trigger_event_with_context_data(iox_listener_t const self,
iox_user_trigger_t const userTrigger,
void (*callback)(iox_user_trigger_t,
void*),
@@ -92,7 +92,7 @@ ENUM iox_ListenerResult iox_listener_attach_user_trigger_event_with_context_data
/// @param[in] subscriberEvent the subscriber event which is registered at the listener
void iox_listener_detach_subscriber_event(iox_listener_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent);
+ const enum iox_SubscriberEvent subscriberEvent);
/// @brief Detaches a user trigger from the listener
/// @param[in] self listener from which the event should be detached
@@ -116,9 +116,9 @@ uint64_t iox_listener_capacity(iox_listener_t const self);
/// @param[in] clientEvent the event which should trigger the listener
/// @param[in] callback the callback which is called when an event triggers the listener
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_client_event(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_client_event(iox_listener_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent,
+ const enum iox_ClientEvent clientEvent,
void (*callback)(iox_client_t));
/// @brief Attaches a client event to the listener. The callback has an additional contextData argument to provide
@@ -129,9 +129,9 @@ ENUM iox_ListenerResult iox_listener_attach_client_event(iox_listener_t const se
/// @param[in] callback the callback which is called when an event triggers the listener
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_client_event_with_context_data(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_client_event_with_context_data(iox_listener_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent,
+ const enum iox_ClientEvent clientEvent,
void (*callback)(iox_client_t, void*),
void* const contextData);
@@ -141,7 +141,7 @@ ENUM iox_ListenerResult iox_listener_attach_client_event_with_context_data(iox_l
/// @param[in] clientEvent the event which should be removed from the listener
void iox_listener_detach_client_event(iox_listener_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent);
+ const enum iox_ClientEvent clientEvent);
/// @brief Attaches a server event to the listener
/// @param[in] self listener to which the event should be attached to
@@ -149,9 +149,9 @@ void iox_listener_detach_client_event(iox_listener_t const self,
/// @param[in] serverEvent the event which should trigger the listener
/// @param[in] callback the callback which is called when an event triggers the listener
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_server_event(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_server_event(iox_listener_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
void (*callback)(iox_server_t));
/// @brief Attaches a server event to the listener. The callback has an additional contextData argument to provide
@@ -162,9 +162,9 @@ ENUM iox_ListenerResult iox_listener_attach_server_event(iox_listener_t const se
/// @param[in] callback the callback which is called when an event triggers the listener
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_server_event_with_context_data(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_server_event_with_context_data(iox_listener_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
void (*callback)(iox_server_t, void*),
void* const contextData);
@@ -174,7 +174,7 @@ ENUM iox_ListenerResult iox_listener_attach_server_event_with_context_data(iox_l
/// @param[in] serverEvent the event which should be removed from the listener
void iox_listener_detach_server_event(iox_listener_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent);
+ const enum iox_ServerEvent serverEvent);
/// @brief Attaches a service discovery event to the listener
/// @param[in] self listener to which the event should be attached to
@@ -182,10 +182,10 @@ void iox_listener_detach_server_event(iox_listener_t const self,
/// @param[in] serviceDiscoveryEvent the event which should trigger the listener
/// @param[in] callback the callback which is called when an event triggers the listener
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult
+enum iox_ListenerResult
iox_listener_attach_service_discovery_event(iox_listener_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
void (*callback)(iox_service_discovery_t));
/// @brief Attaches a service discovery event to the listener. The callback has an additional contextData argument to
@@ -196,10 +196,10 @@ iox_listener_attach_service_discovery_event(iox_listener_t const self,
/// @param[in] callback the callback which is called when an event triggers the listener
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return when successful iox_ListenerResult::ListenerResult_SUCCESS otherwise an enum which describes the error
-ENUM iox_ListenerResult iox_listener_attach_service_discovery_event_with_context_data(
+enum iox_ListenerResult iox_listener_attach_service_discovery_event_with_context_data(
iox_listener_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
void (*callback)(iox_service_discovery_t, void*),
void* const contextData);
@@ -209,6 +209,6 @@ ENUM iox_ListenerResult iox_listener_attach_service_discovery_event_with_context
/// @param[in] serviceDiscoveryEvent the service discovery event which should be removed from the listener
void iox_listener_detach_service_discovery_event(iox_listener_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent);
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent);
#endif
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 9ad8a80735..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 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/publisher.h b/iceoryx_binding_c/include/iceoryx_binding_c/publisher.h
index 3fed75af8f..bfe0b16520 100644
--- a/iceoryx_binding_c/include/iceoryx_binding_c/publisher.h
+++ b/iceoryx_binding_c/include/iceoryx_binding_c/publisher.h
@@ -40,7 +40,7 @@ typedef struct
bool offerOnCreate;
/// @brief describes whether a publisher blocks when subscriber queue is full
- ENUM iox_ConsumerTooSlowPolicy subscriberTooSlowPolicy;
+ enum iox_ConsumerTooSlowPolicy subscriberTooSlowPolicy;
/// @brief this value will be set exclusively by 'iox_pub_options_init' and is not supposed to be modified otherwise
uint64_t initCheck;
@@ -85,9 +85,8 @@ void iox_pub_deinit(iox_pub_t const self);
/// describes the error
/// @note for the user-payload alignment 'IOX_C_CHUNK_DEFAULT_USER_PAYLOAD_ALIGNMENT' is used
/// for a custom user-payload alignment please use 'iox_pub_loan_aligned_chunk'
-ENUM iox_AllocationResult iox_pub_loan_chunk(iox_pub_t const self,
- void** const userPayload,
- const uint64_t userPayloadSize);
+enum iox_AllocationResult
+iox_pub_loan_chunk(iox_pub_t const self, void** const userPayload, const uint64_t userPayloadSize);
/// @brief allocates a chunk in the shared memory with a custom alignment for the user-payload
/// @param[in] self handle of the publisher
@@ -96,7 +95,7 @@ ENUM iox_AllocationResult iox_pub_loan_chunk(iox_pub_t const self,
/// @param[in] userPayloadAlignment user-payload alignment of the allocated chunk
/// @return on success it returns AllocationResult_SUCCESS otherwise a value which
/// describes the error
-ENUM iox_AllocationResult iox_pub_loan_aligned_chunk(iox_pub_t const self,
+enum iox_AllocationResult iox_pub_loan_aligned_chunk(iox_pub_t const self,
void** const userPayload,
const uint64_t userPayloadSize,
const uint32_t userPayloadAlignment);
@@ -111,7 +110,7 @@ ENUM iox_AllocationResult iox_pub_loan_aligned_chunk(iox_pub_t const self,
/// @param[in] userHeaderAlignment user-header alignment of the allocated chunk
/// @return on success it returns AllocationResult_SUCCESS otherwise a value which
/// describes the error
-ENUM iox_AllocationResult iox_pub_loan_aligned_chunk_with_user_header(iox_pub_t const self,
+enum iox_AllocationResult iox_pub_loan_aligned_chunk_with_user_header(iox_pub_t const self,
void** const userPayload,
const uint64_t userPayloadSize,
const uint32_t userPayloadAlignment,
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 41b0753338..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 CLASS RequestHeader* iox_request_header_t;
+typedef IOX_C_CLASS RequestHeader* iox_request_header_t;
/// @brief const request header handle
-typedef const 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 f6dae9c6fb..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 CLASS ResponseHeader* iox_response_header_t;
+typedef IOX_C_CLASS ResponseHeader* iox_response_header_t;
/// @brief const response header handle
-typedef const 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 d53bf4aa95..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 CLASS UntypedServer* iox_server_t;
+typedef IOX_C_CLASS UntypedServer* iox_server_t;
/// @brief options to be set for a server
typedef struct
@@ -38,10 +38,10 @@ typedef struct
bool offerOnCreate;
/// @brief Sets whether the client blocks when the server request queue is full
- ENUM iox_QueueFullPolicy requestQueueFullPolicy;
+ enum iox_QueueFullPolicy requestQueueFullPolicy;
/// @brief Sets whether the server blocks when the client response queue is full
- ENUM iox_ConsumerTooSlowPolicy clientTooSlowPolicy;
+ enum iox_ConsumerTooSlowPolicy clientTooSlowPolicy;
/// @brief this value will be set exclusively by 'iox_server_options_init' and is not supposed to be modified
/// otherwise
@@ -84,7 +84,7 @@ void iox_server_deinit(iox_server_t const self);
/// @param[in] payload pointer in which the pointer to the user-payload of the request is stored
/// @return if a chunk could be received it returns ChunkReceiveResult_SUCCESS otherwise
/// an enum which describes the error
-ENUM iox_ServerRequestResult iox_server_take_request(iox_server_t const self, const void** const payload);
+enum iox_ServerRequestResult iox_server_take_request(iox_server_t const self, const void** const payload);
/// @brief release a previously acquired request (via iox_server_take_request)
/// @param[in] self handle to the server
@@ -100,7 +100,7 @@ void iox_server_release_request(iox_server_t const self, const void* const paylo
/// describes the error
/// @note for the user-payload alignment 'IOX_C_CHUNK_DEFAULT_USER_PAYLOAD_ALIGNMENT' is used
/// for a custom user-payload alignment please use 'iox_server_loan_aligned_response'
-ENUM iox_AllocationResult iox_server_loan_response(iox_server_t const self,
+enum iox_AllocationResult iox_server_loan_response(iox_server_t const self,
const void* const requestPayload,
void** const payload,
const uint64_t payloadSize);
@@ -113,7 +113,7 @@ ENUM iox_AllocationResult iox_server_loan_response(iox_server_t const self,
/// @param[in] payloadAlignment user-payload alignment of the allocated request
/// @return on success it returns AllocationResult_SUCCESS otherwise a value which
/// describes the error
-ENUM iox_AllocationResult iox_server_loan_aligned_response(iox_server_t const self,
+enum iox_AllocationResult iox_server_loan_aligned_response(iox_server_t const self,
const void* const requestPayload,
void** const payload,
const uint64_t payloadSize,
@@ -124,7 +124,7 @@ ENUM iox_AllocationResult iox_server_loan_aligned_response(iox_server_t const se
/// @param[in] payload pointer to the user-payload of the response which should be send
/// @return on success it returns ServerSendResult_SUCCESS otherwise a value which
/// describes the error
-ENUM iox_ServerSendResult iox_server_send(iox_server_t const self, void* const payload);
+enum iox_ServerSendResult iox_server_send(iox_server_t const self, void* const payload);
/// @brief releases ownership of a previously allocated loaned response without sending it
/// @param[in] self handle of the server
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 b48d821143..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 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
@@ -53,7 +53,7 @@ uint64_t iox_service_discovery_find_service(iox_service_discovery_t const self,
iox_service_description_t* const serviceContainer,
const uint64_t serviceContainerCapacity,
uint64_t* missedServices,
- const ENUM iox_MessagingPattern pattern);
+ const enum iox_MessagingPattern pattern);
/// @brief Searches all services with the given messaging pattern that match the provided service description and
/// applies a function to each of them
@@ -68,7 +68,7 @@ void iox_service_discovery_find_service_apply_callable(iox_service_discovery_t c
const char* const instance,
const char* const event,
void (*callable)(const iox_service_description_t),
- const ENUM iox_MessagingPattern pattern);
+ const enum iox_MessagingPattern pattern);
/// @brief Searches all services with the given messaging pattern that match the provided service description and
/// applies a function to each of them. A second parameter for the function can be provided as contextData.
@@ -86,6 +86,6 @@ void iox_service_discovery_find_service_apply_callable_with_context_data(
const char* const event,
void (*callable)(const iox_service_description_t, void*),
void* const contextData,
- const ENUM iox_MessagingPattern pattern);
+ const enum iox_MessagingPattern pattern);
#endif
diff --git a/iceoryx_binding_c/include/iceoryx_binding_c/subscriber.h b/iceoryx_binding_c/include/iceoryx_binding_c/subscriber.h
index 416f5dc910..f1567131d6 100644
--- a/iceoryx_binding_c/include/iceoryx_binding_c/subscriber.h
+++ b/iceoryx_binding_c/include/iceoryx_binding_c/subscriber.h
@@ -43,7 +43,7 @@ typedef struct
bool subscribeOnCreate;
/// @brief describes whether a publisher blocks when subscriber queue is full
- ENUM iox_QueueFullPolicy queueFullPolicy;
+ enum iox_QueueFullPolicy queueFullPolicy;
/// @brief Indicates whether we require the publisher to have historyCapacity > 0.
/// If true and the condition is not met (i.e. historyCapacity = 0), the subscriber will
@@ -97,14 +97,14 @@ void iox_sub_unsubscribe(iox_sub_t const self);
/// @param[in] self handle to the subscriber
/// @return SubscribeState_SUBSCRIBED when successfully subscribed otherwise an enum which
/// describes the current state
-ENUM iox_SubscribeState iox_sub_get_subscription_state(iox_sub_t const self);
+enum iox_SubscribeState iox_sub_get_subscription_state(iox_sub_t const self);
/// @brief retrieve a received chunk
/// @param[in] self handle to the subscriber
/// @param[in] userPayload pointer in which the pointer to the user-payload of the chunk is stored
/// @return if a chunk could be received it returns ChunkReceiveResult_SUCCESS otherwise
/// an enum which describes the error
-ENUM iox_ChunkReceiveResult iox_sub_take_chunk(iox_sub_t const self, const void** const userPayload);
+enum iox_ChunkReceiveResult iox_sub_take_chunk(iox_sub_t const self, const void** const userPayload);
/// @brief release a previously acquired chunk (via iox_sub_take_chunk)
/// @param[in] self handle to the subscriber
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 f09bebd5f2..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 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 3624235d40..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 <time.h>
/// @brief wait set handle
-typedef 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)
@@ -89,9 +89,9 @@ void iox_ws_mark_for_destruction(iox_ws_t const self);
/// @param[in] callback a callback which is attached to the state
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_subscriber_state(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_subscriber_state(iox_ws_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberState subscriberState,
+ const enum iox_SubscriberState subscriberState,
const uint64_t id,
void (*callback)(iox_sub_t));
@@ -105,9 +105,9 @@ ENUM iox_WaitSetResult iox_ws_attach_subscriber_state(iox_ws_t const self,
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_subscriber_state_with_context_data(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_subscriber_state_with_context_data(iox_ws_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberState subscriberState,
+ const enum iox_SubscriberState subscriberState,
const uint64_t id,
void (*callback)(iox_sub_t, void*),
void* const contextData);
@@ -120,9 +120,9 @@ ENUM iox_WaitSetResult iox_ws_attach_subscriber_state_with_context_data(iox_ws_t
/// @param[in] callback a callback which is attached to the event
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_subscriber_event(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_subscriber_event(iox_ws_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent,
+ const enum iox_SubscriberEvent subscriberEvent,
const uint64_t eventId,
void (*callback)(iox_sub_t));
@@ -136,9 +136,9 @@ ENUM iox_WaitSetResult iox_ws_attach_subscriber_event(iox_ws_t const self,
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_subscriber_event_with_context_data(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_subscriber_event_with_context_data(iox_ws_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent,
+ const enum iox_SubscriberEvent subscriberEvent,
const uint64_t eventId,
void (*callback)(iox_sub_t, void*),
void* const contextData);
@@ -150,7 +150,7 @@ ENUM iox_WaitSetResult iox_ws_attach_subscriber_event_with_context_data(iox_ws_t
/// @param[in] callback a callback which is attached to the event
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_user_trigger_event(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_user_trigger_event(iox_ws_t const self,
iox_user_trigger_t const userTrigger,
const uint64_t eventId,
void (*callback)(iox_user_trigger_t));
@@ -164,7 +164,7 @@ ENUM iox_WaitSetResult iox_ws_attach_user_trigger_event(iox_ws_t const self,
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_user_trigger_event_with_context_data(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_user_trigger_event_with_context_data(iox_ws_t const self,
iox_user_trigger_t const userTrigger,
const uint64_t eventId,
void (*callback)(iox_user_trigger_t, void*),
@@ -176,7 +176,7 @@ ENUM iox_WaitSetResult iox_ws_attach_user_trigger_event_with_context_data(iox_ws
/// @param[in] subscriberEvent the event which should be detached from the subscriber
void iox_ws_detach_subscriber_event(iox_ws_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent);
+ const enum iox_SubscriberEvent subscriberEvent);
/// @brief detaches a subscriber state from a waitset
/// @param[in] self handle to the waitset
@@ -184,7 +184,7 @@ void iox_ws_detach_subscriber_event(iox_ws_t const self,
/// @param[in] subscriberState the state which should be detached from the subscriber
void iox_ws_detach_subscriber_state(iox_ws_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberState subscriberState);
+ const enum iox_SubscriberState subscriberState);
/// @brief detaches a user trigger event from a waitset
/// @param[in] self handle to the waitset
@@ -199,9 +199,9 @@ void iox_ws_detach_user_trigger_event(iox_ws_t const self, iox_user_trigger_t co
/// @param[in] callback a callback which is attached to the event
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_client_event(const iox_ws_t self,
+enum iox_WaitSetResult iox_ws_attach_client_event(const iox_ws_t self,
const iox_client_t client,
- const ENUM iox_ClientEvent clientEvent,
+ const enum iox_ClientEvent clientEvent,
const uint64_t eventId,
void (*callback)(iox_client_t));
@@ -214,9 +214,9 @@ ENUM iox_WaitSetResult iox_ws_attach_client_event(const iox_ws_t self,
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_client_event_with_context_data(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_client_event_with_context_data(iox_ws_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent,
+ const enum iox_ClientEvent clientEvent,
const uint64_t eventId,
void (*callback)(iox_client_t, void*),
void* const contextData);
@@ -229,9 +229,9 @@ ENUM iox_WaitSetResult iox_ws_attach_client_event_with_context_data(iox_ws_t con
/// @param[in] callback a callback which is attached to the state
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_client_state(const iox_ws_t self,
+enum iox_WaitSetResult iox_ws_attach_client_state(const iox_ws_t self,
const iox_client_t client,
- const ENUM iox_ClientState clientState,
+ const enum iox_ClientState clientState,
const uint64_t eventId,
void (*callback)(iox_client_t));
@@ -244,9 +244,9 @@ ENUM iox_WaitSetResult iox_ws_attach_client_state(const iox_ws_t self,
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_client_state_with_context_data(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_client_state_with_context_data(iox_ws_t const self,
iox_client_t const client,
- const ENUM iox_ClientState clientState,
+ const enum iox_ClientState clientState,
const uint64_t eventId,
void (*callback)(iox_client_t, void*),
void* const contextData);
@@ -255,13 +255,13 @@ ENUM iox_WaitSetResult iox_ws_attach_client_state_with_context_data(iox_ws_t con
/// @param[in] self handle to the waitset
/// @param[in] client the client which should be detached
/// @param[in] clientEvent the event which should be detached from the client
-void iox_ws_detach_client_event(iox_ws_t const self, iox_client_t const client, const ENUM iox_ClientEvent clientEvent);
+void iox_ws_detach_client_event(iox_ws_t const self, iox_client_t const client, const enum iox_ClientEvent clientEvent);
/// @brief detaches a client state from a waitset
/// @param[in] self handle to the waitset
/// @param[in] client the client which should be detached
/// @param[in] clientState the state which should be detached from the client
-void iox_ws_detach_client_state(iox_ws_t const self, iox_client_t const client, const ENUM iox_ClientState clientState);
+void iox_ws_detach_client_state(iox_ws_t const self, iox_client_t const client, const enum iox_ClientState clientState);
/// @brief attaches a server event to a waitset
/// @param[in] self handle to the waitset
@@ -271,9 +271,9 @@ void iox_ws_detach_client_state(iox_ws_t const self, iox_client_t const client,
/// @param[in] callback a callback which is attached to the event
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_server_event(const iox_ws_t self,
+enum iox_WaitSetResult iox_ws_attach_server_event(const iox_ws_t self,
const iox_server_t server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
const uint64_t eventId,
void (*callback)(iox_server_t));
@@ -286,9 +286,9 @@ ENUM iox_WaitSetResult iox_ws_attach_server_event(const iox_ws_t self,
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_server_event_with_context_data(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_server_event_with_context_data(iox_ws_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
const uint64_t eventId,
void (*callback)(iox_server_t, void*),
void* const contextData);
@@ -301,9 +301,9 @@ ENUM iox_WaitSetResult iox_ws_attach_server_event_with_context_data(iox_ws_t con
/// @param[in] callback a callback which is attached to the state
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_server_state(const iox_ws_t self,
+enum iox_WaitSetResult iox_ws_attach_server_state(const iox_ws_t self,
const iox_server_t server,
- const ENUM iox_ServerState serverState,
+ const enum iox_ServerState serverState,
const uint64_t eventId,
void (*callback)(iox_server_t));
@@ -316,9 +316,9 @@ ENUM iox_WaitSetResult iox_ws_attach_server_state(const iox_ws_t self,
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_server_state_with_context_data(iox_ws_t const self,
+enum iox_WaitSetResult iox_ws_attach_server_state_with_context_data(iox_ws_t const self,
iox_server_t const server,
- const ENUM iox_ServerState serverState,
+ const enum iox_ServerState serverState,
const uint64_t eventId,
void (*callback)(iox_server_t, void*),
void* const contextData);
@@ -327,13 +327,13 @@ ENUM iox_WaitSetResult iox_ws_attach_server_state_with_context_data(iox_ws_t con
/// @param[in] self handle to the waitset
/// @param[in] server the server which should be detached
/// @param[in] serverEvent the event which should be detached from the server
-void iox_ws_detach_server_event(iox_ws_t const self, iox_server_t const server, const ENUM iox_ServerEvent serverEvent);
+void iox_ws_detach_server_event(iox_ws_t const self, iox_server_t const server, const enum iox_ServerEvent serverEvent);
/// @brief detaches a server state from a waitset
/// @param[in] self handle to the waitset
/// @param[in] server the server which should be detached
/// @param[in] serverState the state which should be detached from the server
-void iox_ws_detach_server_state(iox_ws_t const self, iox_server_t const server, const ENUM iox_ServerState serverState);
+void iox_ws_detach_server_state(iox_ws_t const self, iox_server_t const server, const enum iox_ServerState serverState);
/// @brief attaches a service discovery event to a waitset
/// @param[in] self handle to the waitset
@@ -343,9 +343,9 @@ void iox_ws_detach_server_state(iox_ws_t const self, iox_server_t const server,
/// @param[in] callback a callback which is attached to the event
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult iox_ws_attach_service_discovery_event(const iox_ws_t self,
+enum iox_WaitSetResult iox_ws_attach_service_discovery_event(const iox_ws_t self,
const iox_service_discovery_t serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
const uint64_t eventId,
void (*callback)(iox_service_discovery_t));
@@ -358,10 +358,10 @@ ENUM iox_WaitSetResult iox_ws_attach_service_discovery_event(const iox_ws_t self
/// @param[in] contextData a void pointer which is provided as second argument to the callback
/// @return if the attaching was successfull it returns WaitSetResult_SUCCESS, otherwise
/// an enum which describes the error
-ENUM iox_WaitSetResult
+enum iox_WaitSetResult
iox_ws_attach_service_discovery_event_with_context_data(iox_ws_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
const uint64_t eventId,
void (*callback)(iox_service_discovery_t, void*),
void* const contextData);
@@ -372,6 +372,6 @@ iox_ws_attach_service_discovery_event_with_context_data(iox_ws_t const self,
/// @param[in] serviceDiscoveryEvent the event which should be detached from the service discovery
void iox_ws_detach_service_discovery_event(iox_ws_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent);
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent);
#endif
diff --git a/iceoryx_binding_c/source/c2cpp_enum_translation.cpp b/iceoryx_binding_c/source/c2cpp_enum_translation.cpp
index 2f36ed4c9e..2e34186055 100644
--- a/iceoryx_binding_c/source/c2cpp_enum_translation.cpp
+++ b/iceoryx_binding_c/source/c2cpp_enum_translation.cpp
@@ -21,7 +21,7 @@
namespace c2cpp
{
-iox::popo::ConsumerTooSlowPolicy consumerTooSlowPolicy(const ENUM iox_ConsumerTooSlowPolicy policy) noexcept
+iox::popo::ConsumerTooSlowPolicy consumerTooSlowPolicy(const enum iox_ConsumerTooSlowPolicy policy) noexcept
{
switch (policy)
{
@@ -35,7 +35,7 @@ iox::popo::ConsumerTooSlowPolicy consumerTooSlowPolicy(const ENUM iox_ConsumerTo
return iox::popo::ConsumerTooSlowPolicy::DISCARD_OLDEST_DATA;
}
-iox::popo::QueueFullPolicy queueFullPolicy(const ENUM iox_QueueFullPolicy policy) noexcept
+iox::popo::QueueFullPolicy queueFullPolicy(const enum iox_QueueFullPolicy policy) noexcept
{
switch (policy)
{
diff --git a/iceoryx_binding_c/source/c_listener.cpp b/iceoryx_binding_c/source/c_listener.cpp
index e369a30c9c..774fbf1886 100644
--- a/iceoryx_binding_c/source/c_listener.cpp
+++ b/iceoryx_binding_c/source/c_listener.cpp
@@ -49,9 +49,9 @@ void iox_listener_deinit(iox_listener_t const self)
delete self;
}
-ENUM iox_ListenerResult iox_listener_attach_subscriber_event(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_subscriber_event(iox_listener_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent,
+ const enum iox_SubscriberEvent subscriberEvent,
void (*callback)(iox_sub_t))
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
@@ -69,10 +69,10 @@ ENUM iox_ListenerResult iox_listener_attach_subscriber_event(iox_listener_t cons
return ListenerResult_SUCCESS;
}
-ENUM iox_ListenerResult
+enum iox_ListenerResult
iox_listener_attach_subscriber_event_with_context_data(iox_listener_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent,
+ const enum iox_SubscriberEvent subscriberEvent,
void (*callback)(iox_sub_t, void*),
void* const contextData)
{
@@ -91,7 +91,7 @@ iox_listener_attach_subscriber_event_with_context_data(iox_listener_t const self
return ListenerResult_SUCCESS;
}
-ENUM iox_ListenerResult iox_listener_attach_user_trigger_event(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_user_trigger_event(iox_listener_t const self,
iox_user_trigger_t const userTrigger,
void (*callback)(iox_user_trigger_t))
{
@@ -108,7 +108,7 @@ ENUM iox_ListenerResult iox_listener_attach_user_trigger_event(iox_listener_t co
return ListenerResult_SUCCESS;
}
-ENUM iox_ListenerResult iox_listener_attach_user_trigger_event_with_context_data(iox_listener_t const self,
+enum iox_ListenerResult iox_listener_attach_user_trigger_event_with_context_data(iox_listener_t const self,
iox_user_trigger_t const userTrigger,
void (*callback)(iox_user_trigger_t,
void*),
@@ -133,7 +133,7 @@ ENUM iox_ListenerResult iox_listener_attach_user_trigger_event_with_context_data
void iox_listener_detach_subscriber_event(iox_listener_t const self,
iox_sub_t const subscriber,
- const ENUM iox_SubscriberEvent subscriberEvent)
+ const enum iox_SubscriberEvent subscriberEvent)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(subscriber != nullptr, "'subscriver' must not be a 'nullptr'");
@@ -165,7 +165,7 @@ uint64_t iox_listener_capacity(iox_listener_t const self)
iox_ListenerResult iox_listener_attach_client_event(iox_listener_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent,
+ const enum iox_ClientEvent clientEvent,
void (*callback)(iox_client_t))
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
@@ -181,7 +181,7 @@ iox_ListenerResult iox_listener_attach_client_event(iox_listener_t const self,
iox_ListenerResult iox_listener_attach_client_event_with_context_data(iox_listener_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent,
+ const enum iox_ClientEvent clientEvent,
void (*callback)(iox_client_t, void*),
void* const contextData)
{
@@ -199,7 +199,7 @@ iox_ListenerResult iox_listener_attach_client_event_with_context_data(iox_listen
void iox_listener_detach_client_event(iox_listener_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent)
+ const enum iox_ClientEvent clientEvent)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(client != nullptr, "'client' must not be a 'nullptr'");
@@ -210,7 +210,7 @@ void iox_listener_detach_client_event(iox_listener_t const self,
iox_ListenerResult iox_listener_attach_server_event(iox_listener_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
void (*callback)(iox_server_t))
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
@@ -226,7 +226,7 @@ iox_ListenerResult iox_listener_attach_server_event(iox_listener_t const self,
iox_ListenerResult iox_listener_attach_server_event_with_context_data(iox_listener_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
void (*callback)(iox_server_t, void*),
void* const contextData)
{
@@ -244,7 +244,7 @@ iox_ListenerResult iox_listener_attach_server_event_with_context_data(iox_listen
void iox_listener_detach_server_event(iox_listener_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent)
+ const enum iox_ServerEvent serverEvent)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(server != nullptr, "'server' must not be a 'nullptr'");
@@ -255,7 +255,7 @@ void iox_listener_detach_server_event(iox_listener_t const self,
iox_ListenerResult
iox_listener_attach_service_discovery_event(iox_listener_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
void (*callback)(iox_service_discovery_t))
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
@@ -273,7 +273,7 @@ iox_listener_attach_service_discovery_event(iox_listener_t const self,
iox_ListenerResult iox_listener_attach_service_discovery_event_with_context_data(
iox_listener_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
void (*callback)(iox_service_discovery_t, void*),
void* const contextData)
{
@@ -291,7 +291,7 @@ iox_ListenerResult iox_listener_attach_service_discovery_event_with_context_data
void iox_listener_detach_service_discovery_event(iox_listener_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent)
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(serviceDiscovery != nullptr, "'serviceDiscovery' must not be a 'nullptr'");
diff --git a/iceoryx_binding_c/source/c_service_discovery.cpp b/iceoryx_binding_c/source/c_service_discovery.cpp
index 517bff51d6..2f7cb892ed 100644
--- a/iceoryx_binding_c/source/c_service_discovery.cpp
+++ b/iceoryx_binding_c/source/c_service_discovery.cpp
@@ -50,7 +50,7 @@ uint64_t iox_service_discovery_find_service(iox_service_discovery_t const self,
iox_service_description_t* const serviceContainer,
const uint64_t serviceContainerCapacity,
uint64_t* missedServices,
- const ENUM iox_MessagingPattern pattern)
+ const enum iox_MessagingPattern pattern)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(serviceContainer != nullptr, "'serviceContainer' must not be a 'nullptr'");
@@ -94,7 +94,7 @@ void iox_service_discovery_find_service_apply_callable(iox_service_discovery_t c
const char* const instance,
const char* const event,
void (*callable)(const iox_service_description_t),
- const ENUM iox_MessagingPattern pattern)
+ const enum iox_MessagingPattern pattern)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(callable != nullptr, "'callable' must not be a 'nullptr'");
@@ -126,7 +126,7 @@ void iox_service_discovery_find_service_apply_callable_with_context_data(
const char* const event,
void (*callable)(const iox_service_description_t, void*),
void* const contextData,
- const ENUM iox_MessagingPattern pattern)
+ const enum iox_MessagingPattern pattern)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(callable != nullptr, "'callable' must not be a 'nullptr'");
diff --git a/iceoryx_binding_c/source/c_wait_set.cpp b/iceoryx_binding_c/source/c_wait_set.cpp
index 9a599251cd..feebf947fb 100644
--- a/iceoryx_binding_c/source/c_wait_set.cpp
+++ b/iceoryx_binding_c/source/c_wait_set.cpp
@@ -259,7 +259,7 @@ iox_WaitSetResult iox_ws_attach_client_event(const iox_ws_t self,
iox_WaitSetResult iox_ws_attach_client_event_with_context_data(iox_ws_t const self,
iox_client_t const client,
- const ENUM iox_ClientEvent clientEvent,
+ const enum iox_ClientEvent clientEvent,
const uint64_t eventId,
void (*callback)(iox_client_t, void*),
void* const contextData)
@@ -290,7 +290,7 @@ iox_WaitSetResult iox_ws_attach_client_state(const iox_ws_t self,
iox_WaitSetResult iox_ws_attach_client_state_with_context_data(iox_ws_t const self,
iox_client_t const client,
- const ENUM iox_ClientState clientState,
+ const enum iox_ClientState clientState,
const uint64_t eventId,
void (*callback)(iox_client_t, void*),
void* const contextData)
@@ -306,7 +306,7 @@ iox_WaitSetResult iox_ws_attach_client_state_with_context_data(iox_ws_t const se
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}
-void iox_ws_detach_client_event(iox_ws_t const self, iox_client_t const client, const ENUM iox_ClientEvent clientEvent)
+void iox_ws_detach_client_event(iox_ws_t const self, iox_client_t const client, const enum iox_ClientEvent clientEvent)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(client != nullptr, "'client' must not be a 'nullptr'");
@@ -314,7 +314,7 @@ void iox_ws_detach_client_event(iox_ws_t const self, iox_client_t const client,
self->detachEvent(*client, c2cpp::clientEvent(clientEvent));
}
-void iox_ws_detach_client_state(iox_ws_t const self, iox_client_t const client, const ENUM iox_ClientState clientState)
+void iox_ws_detach_client_state(iox_ws_t const self, iox_client_t const client, const enum iox_ClientState clientState)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(client != nullptr, "'client' must not be a 'nullptr'");
@@ -324,7 +324,7 @@ void iox_ws_detach_client_state(iox_ws_t const self, iox_client_t const client,
iox_WaitSetResult iox_ws_attach_server_event(const iox_ws_t self,
const iox_server_t server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
const uint64_t eventId,
void (*callback)(iox_server_t))
{
@@ -337,7 +337,7 @@ iox_WaitSetResult iox_ws_attach_server_event(const iox_ws_t self,
iox_WaitSetResult iox_ws_attach_server_event_with_context_data(iox_ws_t const self,
iox_server_t const server,
- const ENUM iox_ServerEvent serverEvent,
+ const enum iox_ServerEvent serverEvent,
const uint64_t eventId,
void (*callback)(iox_server_t, void*),
void* const contextData)
@@ -355,7 +355,7 @@ iox_WaitSetResult iox_ws_attach_server_event_with_context_data(iox_ws_t const se
iox_WaitSetResult iox_ws_attach_server_state(const iox_ws_t self,
const iox_server_t server,
- const ENUM iox_ServerState serverState,
+ const enum iox_ServerState serverState,
const uint64_t eventId,
void (*callback)(iox_server_t))
{
@@ -368,7 +368,7 @@ iox_WaitSetResult iox_ws_attach_server_state(const iox_ws_t self,
iox_WaitSetResult iox_ws_attach_server_state_with_context_data(iox_ws_t const self,
iox_server_t const server,
- const ENUM iox_ServerState serverState,
+ const enum iox_ServerState serverState,
const uint64_t eventId,
void (*callback)(iox_server_t, void*),
void* const contextData)
@@ -384,7 +384,7 @@ iox_WaitSetResult iox_ws_attach_server_state_with_context_data(iox_ws_t const se
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}
-void iox_ws_detach_server_event(iox_ws_t const self, iox_server_t const server, const ENUM iox_ServerEvent serverEvent)
+void iox_ws_detach_server_event(iox_ws_t const self, iox_server_t const server, const enum iox_ServerEvent serverEvent)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(server != nullptr, "'server' must not be a 'nullptr'");
@@ -392,7 +392,7 @@ void iox_ws_detach_server_event(iox_ws_t const self, iox_server_t const server,
self->detachEvent(*server, c2cpp::serverEvent(serverEvent));
}
-void iox_ws_detach_server_state(iox_ws_t const self, iox_server_t const server, const ENUM iox_ServerState serverState)
+void iox_ws_detach_server_state(iox_ws_t const self, iox_server_t const server, const enum iox_ServerState serverState)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(server != nullptr, "'server' must not be a 'nullptr'");
@@ -402,7 +402,7 @@ void iox_ws_detach_server_state(iox_ws_t const self, iox_server_t const server,
iox_WaitSetResult iox_ws_attach_service_discovery_event(const iox_ws_t self,
const iox_service_discovery_t serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
const uint64_t eventId,
void (*callback)(iox_service_discovery_t))
{
@@ -417,7 +417,7 @@ iox_WaitSetResult iox_ws_attach_service_discovery_event(const iox_ws_t self,
iox_WaitSetResult
iox_ws_attach_service_discovery_event_with_context_data(iox_ws_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent,
const uint64_t eventId,
void (*callback)(iox_service_discovery_t, void*),
void* const contextData)
@@ -436,7 +436,7 @@ iox_ws_attach_service_discovery_event_with_context_data(iox_ws_t const self,
void iox_ws_detach_service_discovery_event(iox_ws_t const self,
iox_service_discovery_t const serviceDiscovery,
- const ENUM iox_ServiceDiscoveryEvent serviceDiscoveryEvent)
+ const enum iox_ServiceDiscoveryEvent serviceDiscoveryEvent)
{
IOX_ENFORCE(self != nullptr, "'self' must not be a 'nullptr'");
IOX_ENFORCE(serviceDiscovery != nullptr, "'serviceDiscovery' must not be a 'nullptr'");