a few keller-tidy

eclipse-ecal · Apr 23, 2024 · f82d20d · f82d20d
1 parent d6b0709
commit f82d20d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/ecal/core/include/ecal/ecal_util.h b/ecal/core/include/ecal/ecal_util.h
@@ -89,9 +89,7 @@ namespace eCAL
 
       bool operator<(const SServiceMethod& other) const
       {
-        if (service_name != other.service_name)
-          return service_name < other.service_name;
-        return method_name < other.method_name;
+        return std::tie(service_name, method_name) < std::tie(other.service_name, other.method_name);
       }
     };
     using QualityServiceInfoMultimap = std::multimap<SServiceMethod, SQualityServiceInfo>;

diff --git a/ecal/core/src/ecal_descgate.h b/ecal/core/src/ecal_descgate.h
@@ -33,6 +33,7 @@
 #include <map>
 #include <mutex>
 #include <string>
+#include <tuple>
 
 namespace eCAL
 {
@@ -43,9 +44,7 @@ namespace eCAL
 
     bool operator<(const STopicIdKey& other) const
     {
-      if (topic_name != other.topic_name)
-        return topic_name < other.topic_name;
-      return topic_id < other.topic_id;
+      return std::tie(topic_name, topic_id) < std::tie(other.topic_name, other.topic_id);
     }
   };
 
@@ -57,11 +56,7 @@ namespace eCAL
 
     bool operator<(const SServiceIdKey& other) const
     {
-      if (service_name != other.service_name)
-        return service_name < other.service_name;
-      if (service_id != other.service_id)
-        return service_id < other.service_id;
-      return method_name < other.method_name;
+      return std::tie(service_name, service_id) < std::tie(other.service_name, other.service_id);
     }
   };
 

diff --git a/ecal/core/src/ecal_util.cpp b/ecal/core/src/ecal_util.cpp
@@ -38,7 +38,7 @@ namespace
    *
    * @return                                   Set of SQualityTopicInfo
   **/
-  std::set<eCAL::Util::SQualityTopicInfo> GetQualityTopicInfoSet(const std::string& topic_name_, const std::multimap<std::string, eCAL::Util::SQualityTopicInfo>& quality_data_type_info_multi_map_)
+  std::set<eCAL::Util::SQualityTopicInfo> GetQualityTopicInfoSet(const std::string& topic_name_, const eCAL::Util::QualityTopicInfoMultiMap& quality_data_type_info_multi_map_)
   {
     std::set<eCAL::Util::SQualityTopicInfo> quality_topic_info_set;
 
@@ -60,7 +60,7 @@ namespace
    *
    * @return                                 Set of SQualityServiceInfo
   **/
-  std::set<eCAL::Util::SQualityServiceInfo> GetQualityServiceInfoSet(const std::string& service_name_, const std::string& method_name_, std::multimap<eCAL::Util::SServiceMethod, eCAL::Util::SQualityServiceInfo> quality_service_info_multi_map_)
+  std::set<eCAL::Util::SQualityServiceInfo> GetQualityServiceInfoSet(const std::string& service_name_, const std::string& method_name_, const eCAL::Util::QualityServiceInfoMultimap& quality_service_info_multi_map_)
   {
     std::set<eCAL::Util::SQualityServiceInfo> quality_service_info_set;