Skip to content

Commit f414b2d

Browse files
committed
Update
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
1 parent f1039d1 commit f414b2d

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

rmw_microxrcedds_c/include/rmw_microros/error_handling.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ typedef enum
4444
typedef enum
4545
{
4646
RMW_UROS_ERROR_ENTITY_CREATION = 0,
47+
RMW_UROS_ERROR_ENTITY_DESTRUCTION,
4748
RMW_UROS_ERROR_MIDDLEWARE_ALLOCATION,
4849
} rmw_uros_error_source_t;
4950

rmw_microxrcedds_c/include/rmw_microxrcedds_c/rmw_c_macros.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#ifndef RMW_MICROXRCEDDS_C__RMW_C_MACROS_H_
1616
#define RMW_MICROXRCEDDS_C__RMW_C_MACROS_H_
1717

18+
#include <rmw/error_handling.h>
19+
1820
#define RMW_CHECK_TYPE_IDENTIFIERS_MATCH(ElementName, ElementTypeID, ExpectedTypeID, OnFailure) \
1921
{ \
2022
if (strcmp(ElementTypeID, ExpectedTypeID) != 0) { \

rmw_microxrcedds_c/src/rmw_microros_internal/memory_error_handling_internal.h renamed to rmw_microxrcedds_c/src/rmw_microros_internal/error_handling_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ extern "C"
3131
extern rmw_uros_error_handling error_callback;
3232

3333
#define RMW_UROS_TRACE_ERROR(entity, source, desc, ...) \
34+
RMW_SET_ERROR_MSG(desc); \
3435
if (NULL != error_callback) { \
3536
rmw_uros_error_context_t ctx = {__VA_ARGS__}; \
3637
ctx.description = desc; \
37-
RMW_SET_ERROR_MSG(desc); \
3838
error_callback(entity, source, ctx, __FILE__, __LINE__); \
3939
}
4040

0 commit comments

Comments
 (0)