Skip to content
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

Jump to bottom

Replace const char * with a std::array<char, TOPIC_NAME_LENGTH> as the key of IPM IDTopicMap #671

Merged
merged 7 commits into from
Apr 4, 2019
Merged

Replace const char * with a std::array<char, TOPIC_NAME_LENGTH> as the key of IPM IDTopicMap #671

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67bb6c8
Use std:string and not const char * as key in IPM IDTopicMap
ivanpauno Mar 28, 2019
4b23cf4
Corrected Allocator of IDTopicMap.
ivanpauno Mar 28, 2019
8209bd4
Replaced std::string with FixedSizeString
ivanpauno Apr 3, 2019
4bcbbe1
Added forgotten visibility macro to FixedSizeString operator<
ivanpauno Apr 3, 2019
5444254
Use std::array<char, N> as FixedSizeString
ivanpauno Apr 3, 2019
e22ff95
Solves windows and macOS build problems
ivanpauno Apr 4, 2019
49a7c1e
Add forgotten '#include <array>'
ivanpauno Apr 4, 2019
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
14 changes: 3 additions & 11 deletions rclcpp/include/rclcpp/intra_process_manager_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,19 +285,11 @@ class IntraProcessManagerImpl : public IntraProcessManagerImplBase
std::hash<uint64_t>, std::equal_to<uint64_t>,
RebindAlloc<std::pair<const uint64_t, SubscriptionBase::WeakPtr>>>;

struct strcmp_wrapper
{
bool
operator()(const char * lhs, const char * rhs) const
{
return std::strcmp(lhs, rhs) < 0;
}
};
using IDTopicMap = std::map<
const char *,
std::string,
AllocSet,
strcmp_wrapper,
RebindAlloc<std::pair<const char * const, AllocSet>>>;
std::less<std::string>,
RebindAlloc<std::pair<const std::string, AllocSet>>>;

SubscriptionMap subscriptions_;

Expand Down