Skip to content

Commit 5572dd0

Browse files
update cast to modern style (#418) (#462)
* update cast to modern style Signed-off-by: Mario Prats <marioprats@gmail.com> (cherry picked from commit 5bd1230) Co-authored-by: Mario Prats <marioprats@gmail.com>
1 parent 51b5876 commit 5572dd0

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

resource/logging_macros.h.em

+8-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
#include <stdio.h>
2525
#include <stdlib.h>
2626

27+
// This is to avoid compilation warnings in C++ with '-Wold-style-cast'.
28+
#ifdef __cplusplus
29+
#define RCUTILS_CAST_DURATION(x) (static_cast < rcutils_duration_value_t > (x))
30+
#else
31+
#define RCUTILS_CAST_DURATION(x) ((rcutils_duration_value_t)x)
32+
#endif
33+
2734
#ifdef __cplusplus
2835
extern "C"
2936
{
@@ -174,7 +181,7 @@ typedef bool (* RclLogFilter)();
174181
* A macro initializing and checking the `throttle` condition.
175182
*/
176183
#define RCUTILS_LOG_CONDITION_THROTTLE_BEFORE(get_time_point_value, duration) { \
177-
static rcutils_duration_value_t __rcutils_logging_duration = RCUTILS_MS_TO_NS((rcutils_duration_value_t)duration); \
184+
static rcutils_duration_value_t __rcutils_logging_duration = RCUTILS_MS_TO_NS(RCUTILS_CAST_DURATION(duration)); \
178185
static rcutils_time_point_value_t __rcutils_logging_last_logged = 0; \
179186
rcutils_time_point_value_t __rcutils_logging_now = 0; \
180187
bool __rcutils_logging_condition = true; \

0 commit comments

Comments
 (0)