Merge pull request #270 from ros2/composition

fix allocator type
This commit is contained in:
Dirk Thomas 2016-11-10 16:55:02 -08:00 committed by GitHub
commit 5894a9cd4e

View file

@ -254,7 +254,7 @@ private:
std::hash<uint64_t>, std::equal_to<uint64_t>,
RebindAlloc<std::pair<const uint64_t, subscription::SubscriptionBase::WeakPtr>>>;
using IDTopicMap = std::map<std::string, AllocSet,
std::less<std::string>, RebindAlloc<std::pair<std::string, AllocSet>>>;
std::less<std::string>, RebindAlloc<std::pair<const std::string, AllocSet>>>;
SubscriptionMap subscriptions_;