Use transparent comparator 'std::less<>' with associative string container (sonar).

[simgrid.git] / src / smpi / internals / smpi_global.cpp

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index ba46a4b..741fc10 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -63,7 +63,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke
 
 #if HAVE_PAPI
 std::string papi_default_config_name = "default";
-std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
+std::map</* computation unit name */ std::string, papi_process_data, std::less<>> units2papi_setup;
 #endif
 
 std::unordered_map<std::string, double> location2speedup;
@@ -275,9 +275,7 @@ static void smpi_init_papi()
         }
         XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name);
 
-        counters2values.push_back(
-            // We cannot just pass *events_it, as this is of type const basic_string
-            std::make_pair(std::string(*events_it), 0LL));
+        counters2values.emplace_back(*events_it, 0LL);
       }
 
       std::string unit_name    = *(event_tokens.begin());
@@ -379,13 +377,13 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of
 #endif
   // If this point is reached, sendfile() actually is not available.  Copy file by hand.
   std::vector<unsigned char> buf(1024 * 1024 * 4);
-  while (int got = read(fdin, buf.data(), buf.size())) {
+  while (ssize_t got = read(fdin, buf.data(), buf.size())) {
     if (got == -1) {
       xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str());
     } else {
       const unsigned char* p = buf.data();
-      int todo = got;
-      while (int done = write(fdout, p, todo)) {
+      ssize_t todo           = got;
+      while (ssize_t done = write(fdout, p, todo)) {
         if (done == -1) {
           xbt_assert(errno == EINTR, "Cannot write into %s", target.c_str());
         } else {