Skip to content

Consolidate macro duplication #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dirk-thomas merged 3 commits into from
Jul 23, 2020
Merged

Consolidate macro duplication #653

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e494eb8
Consolidate macro duplication
rotu May 15, 2020
2c1e705
Merge remote-tracking branch 'origin/master' into macros
rotu May 16, 2020
b8f11aa
readd extern C
dirk-thomas Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion rcl/include/rcl/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#ifndef RCL__MACROS_H_
#define RCL__MACROS_H_

#include "rcutils/macros.h"

#ifdef __cplusplus
extern "C"
{
Expand All @@ -23,7 +25,7 @@ extern "C"
/// Ignored return values of functions with this macro will emit a warning.
#define RCL_WARN_UNUSED RCUTILS_WARN_UNUSED

#define RCL_UNUSED(x) (void)(x)
#define RCL_UNUSED(x) RCUTILS_UNUSED(x)

#ifdef __cplusplus
}
Expand Down