Removed more redundant std::pair typedefs

* connectors/psdd4ccm/impl/psdd4ccm_config_util.h: * exf/deployment/scheduler/ciaox11_exf_scheduler_i.cpp: * exf/deployment/scheduler/ciaox11_exf_scheduler_i.h:
RemedyIT · Aug 16, 2023 · fc03f73 · fc03f73
1 parent 4561d5e
commit fc03f73
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/connectors/psdd4ccm/impl/psdd4ccm_config_util.h b/connectors/psdd4ccm/impl/psdd4ccm_config_util.h
@@ -16,14 +16,12 @@ namespace PSDD
 {
   namespace Util
   {
-    typedef std::pair<std::string, CORBA::Any> property_pair_t;
     typedef std::map<std::string, CORBA::Any> property_map_t;
 
-    inline void build_property_map (const ::Components::ConfigValues &values,
-                                    property_map_t& map)
+    inline void build_property_map (const ::Components::ConfigValues &values, property_map_t& map)
     {
       for (const ::Components::ConfigValue& v : values)
-        map.insert (property_pair_t (v.name (), v.value ()));
+        map.insert (std::pair{v.name (), v.value ()});
     }
 
   }

diff --git a/exf/deployment/scheduler/ciaox11_exf_scheduler_i.cpp b/exf/deployment/scheduler/ciaox11_exf_scheduler_i.cpp
@@ -426,7 +426,7 @@ namespace CIAOX11
               }
 
               // register group dispatcher
-              this->groups_.insert (GROUP_PAIR (lane_group, GROUP_ENTRY {dispatcher}));
+              this->groups_.insert (std::pair{lane_group, GROUP_ENTRY {dispatcher}});
 
               CIAOX11_EXF_LOG_DEBUG ("ExF::Impl::Scheduler::open_scheduling_lane - "\
                                  "opening dispatch gate for " << instance_id <<
@@ -517,7 +517,7 @@ namespace CIAOX11
             CIAOX11_EXF_LOG_DEBUG ("ExF::Impl::Scheduler::open_scheduling_lane - "\
                                "registering scheduling lane for " << instance_id);
             // register lane
-            this->lanes_.insert (LANE_PAIR (instance_id, lane_entry));
+            this->lanes_.insert (std::pair{instance_id, lane_entry});
             std::swap (lane, lane_entry.lane_);
           }
         } // leave lock scope

diff --git a/exf/deployment/scheduler/ciaox11_exf_scheduler_i.h b/exf/deployment/scheduler/ciaox11_exf_scheduler_i.h
@@ -94,7 +94,6 @@ namespace CIAOX11
           std::string group_ {};
         };
 
-        using LANE_PAIR = std::pair<std::string, LANE_ENTRY>;
         using LANE_MAP = std::map<std::string, LANE_ENTRY>;
 
         struct GROUP_ENTRY
@@ -108,7 +107,6 @@ namespace CIAOX11
           uint32_t lane_count_ {};
         };
 
-        using GROUP_PAIR = std::pair<std::string, GROUP_ENTRY>;
         using GROUP_MAP = std::map<std::string, GROUP_ENTRY>;
 
         LANE_MAP lanes_ {};