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

Correct the coding style to pass CI test.

Browse source 
Signed-off-by: evshary <evshary@gmail.com>
This commit is contained in:
evshary 2020-02-12 13:47:37 +08:00 • committed by eboasson
parent d2a22d3f59
commit 275d3dd42a
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -2748,10 +2748,11 @@ static bool demangle_topic_type(
std::string & demangled_type_name) std::string & demangled_type_name)
{ {
bool is_def_kind = topic_kind == topic_kind::DEFAULT; bool is_def_kind = topic_kind == topic_kind::DEFAULT;
const auto re_typ = std::regex("^(.*::)dds_::(.*)_" + const auto re_typ = std::regex(
(is_def_kind ? std::string() : std::string("(Response|Request)_")) + "^(.*::)dds_::(.*)_" +
std::string("$"), (is_def_kind ? std::string() : std::string("(Response|Request)_")) +
std::regex::extended); std::string("$"),
std::regex::extended);
std::cmatch cm_typ; std::cmatch cm_typ;
if (std::regex_search(type_name, cm_typ, re_typ)) { if (std::regex_search(type_name, cm_typ, re_typ)) {
demangled_type_name = demangled_type_name =

5
rmw_cyclonedds_cpp/src/serdata.cpp
View file

@ -453,8 +453,9 @@ bool sertopic_rmw_equal(
if (a->is_request_header != b->is_request_header) { if (a->is_request_header != b->is_request_header) {
return false; return false;
} }
if (strcmp(a->type_support.typesupport_identifier_, if (strcmp(
b->type_support.typesupport_identifier_) != 0) a->type_support.typesupport_identifier_,
b->type_support.typesupport_identifier_) != 0)
{ {
return false; return false;
} }