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

Remove const modifier to prevent compiler error for GCC 8. (#403)

Browse source
This commit is contained in:
Hunter Allen 2017-11-20 15:54:53 -05:00 • committed by GitHub
parent 5c57de016f
commit 9be9d66da5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp
View file

@ -200,11 +200,11 @@ NodeParameters::list_parameters(const std::vector<std::string> & prefixes, uint6
// TODO(mikaelarguedas) define parameter separator different from "/" to avoid ambiguity // TODO(mikaelarguedas) define parameter separator different from "/" to avoid ambiguity
// using "." for now // using "." for now
const char separator = '.'; const char * separator = ".";
for (auto & kv : parameters_) { for (auto & kv : parameters_) {
bool get_all = (prefixes.size() == 0) && bool get_all = (prefixes.size() == 0) &&
((depth == rcl_interfaces::srv::ListParameters::Request::DEPTH_RECURSIVE) || ((depth == rcl_interfaces::srv::ListParameters::Request::DEPTH_RECURSIVE) ||
(static_cast<uint64_t>(std::count(kv.first.begin(), kv.first.end(), separator)) < depth)); (static_cast<uint64_t>(std::count(kv.first.begin(), kv.first.end(), *separator)) < depth));
bool prefix_matches = std::any_of(prefixes.cbegin(), prefixes.cend(), bool prefix_matches = std::any_of(prefixes.cbegin(), prefixes.cend(),
[&kv, &depth, &separator](const std::string & prefix) { [&kv, &depth, &separator](const std::string & prefix) {
if (kv.first == prefix) { if (kv.first == prefix) {
@ -214,7 +214,7 @@ NodeParameters::list_parameters(const std::vector<std::string> & prefixes, uint6
std::string substr = kv.first.substr(length); std::string substr = kv.first.substr(length);
// Cast as unsigned integer to avoid warning // Cast as unsigned integer to avoid warning
return (depth == rcl_interfaces::srv::ListParameters::Request::DEPTH_RECURSIVE) || return (depth == rcl_interfaces::srv::ListParameters::Request::DEPTH_RECURSIVE) ||
(static_cast<uint64_t>(std::count(substr.begin(), substr.end(), separator)) < depth); (static_cast<uint64_t>(std::count(substr.begin(), substr.end(), *separator)) < depth);
} }
return false; return false;
}); });