niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address CMake and uncrustify linter violations

Browse source
This commit is contained in:
Scott K Logan 2019-09-13 16:55:09 -05:00 • committed by eboasson
parent 44e61e20e0
commit e849c71122
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rmw_cyclonedds_cpp/CMakeLists.txt
View file

@ -33,7 +33,7 @@ find_package(ament_cmake_ros REQUIRED)
find_package(rcutils REQUIRED) find_package(rcutils REQUIRED)
if (CYCLONEDDS_FROM_SOURCE) if(CYCLONEDDS_FROM_SOURCE)
message("Building CycloneDDS from source") message("Building CycloneDDS from source")
find_package(cyclonedds_vendor REQUIRED) find_package(cyclonedds_vendor REQUIRED)
else() else()

6
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -69,8 +69,8 @@
#define REPORT_BLOCKED_REQUESTS 0 #define REPORT_BLOCKED_REQUESTS 0
#define RET_ERR_X(msg, code) do {RMW_SET_ERROR_MSG(msg); code;} while (0) #define RET_ERR_X(msg, code) do {RMW_SET_ERROR_MSG(msg); code;} while (0)
#define RET_NULL_X(var, code) do {if (!var) RET_ERR_X (#var " is null", code);} while (0) #define RET_NULL_X(var, code) do {if (!var) {RET_ERR_X(#var " is null", code);}} while (0)
#define RET_ALLOC_X(var, code) do {if (!var) RET_ERR_X ("failed to allocate " #var, code); \ #define RET_ALLOC_X(var, code) do {if (!var) {RET_ERR_X("failed to allocate " #var, code);} \
} while (0) } while (0)
#define RET_WRONG_IMPLID_X(var, code) do { \ #define RET_WRONG_IMPLID_X(var, code) do { \
RET_NULL_X(var, code); \ RET_NULL_X(var, code); \
@ -2571,7 +2571,7 @@ static rmw_ret_t get_cs_names_and_types_by_node(
const auto re_typ = std::regex("^(.*::)dds_::(.*)_(Response|Request)_$", std::regex::extended); const auto re_typ = std::regex("^(.*::)dds_::(.*)_(Response|Request)_$", std::regex::extended);
const auto filter_and_map = const auto filter_and_map =
[re_tp, re_typ, guids, node_name, [re_tp, re_typ, guids, node_name,
looking_for_services](const dds_builtintopic_endpoint_t & sample, std::string & topic_name, looking_for_services](const dds_builtintopic_endpoint_t & sample, std::string & topic_name,
std::string & type_name) -> bool { std::string & type_name) -> bool {
std::cmatch cm_tp, cm_typ; std::cmatch cm_tp, cm_typ;
if (node_name != nullptr && guids.count(sample.participant_key) == 0) { if (node_name != nullptr && guids.count(sample.participant_key) == 0) {