fix showing duplicate keys in --print-pairs (#225)

Signed-off-by: Dirk Thomas <[email protected]>
ros2 · Dec 5, 2019 · a7462b7 · a7462b7
1 parent 46baa88
commit a7462b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/include/ros1_bridge/bridge.hpp b/include/ros1_bridge/bridge.hpp
@@ -58,10 +58,10 @@ get_2to1_mapping(
   const std::string & ros2_type_name,
   std::string & ros1_type_name);
 
-std::map<std::string, std::string>
+std::multimap<std::string, std::string>
 get_all_message_mappings_2to1();
 
-std::map<std::string, std::string>
+std::multimap<std::string, std::string>
 get_all_service_mappings_2to1();
 
 std::shared_ptr<FactoryInterface>

diff --git a/resource/get_mappings.cpp.em b/resource/get_mappings.cpp.em
@@ -61,10 +61,10 @@ get_2to1_mapping(const std::string & ros2_type_name, std::string & ros1_type_nam
   return false;
 }
 
-std::map<std::string, std::string>
+std::multimap<std::string, std::string>
 get_all_message_mappings_2to1()
 {
-  static std::map<std::string, std::string> mappings = {
+  static std::multimap<std::string, std::string> mappings = {
 @[for m in mappings]@
     {
       "@(m.ros2_msg.package_name)/msg/@(m.ros2_msg.message_name)",  // ROS 2
@@ -75,10 +75,10 @@ get_all_message_mappings_2to1()
   return mappings;
 }
 
-std::map<std::string, std::string>
+std::multimap<std::string, std::string>
 get_all_service_mappings_2to1()
 {
-  static std::map<std::string, std::string> mappings = {
+  static std::multimap<std::string, std::string> mappings = {
 @[for s in services]@
     {
       "@(s['ros2_package'])/srv/@(s['ros2_name'])",  // ROS 2