[mc] Use string::compare instead of strcmp

diff --git a/src/mc/mc_dwarf.hpp b/src/mc/mc_dwarf.hpp
index 8e73e28..7cde115 100644 (file)
--- a/src/mc/mc_dwarf.hpp
+++ b/src/mc/mc_dwarf.hpp
@@ -190,7 +190,7 @@ static inline
 bool MC_compare_variable(
   simgrid::mc::Variable const& a, simgrid::mc::Variable const& b)
 {
 bool MC_compare_variable(
   simgrid::mc::Variable const& a, simgrid::mc::Variable const& b)
 {

-  int cmp = strcmp(a.name.c_str(), b.name.c_str());
+  int cmp = a.name.compare(b.name);

   if (cmp < 0)
     return true;
   else if (cmp > 0)
   if (cmp < 0)
     return true;
   else if (cmp > 0)

diff --git a/src/mc/mcer_ignore.cpp b/src/mc/mcer_ignore.cpp
index 1233e93..f9cc9e7 100644 (file)
--- a/src/mc/mcer_ignore.cpp
+++ b/src/mc/mcer_ignore.cpp
@@ -126,7 +126,7 @@ void MCer_ignore_global_variable(const char *name)
     while (start <= end) {
       unsigned int cursor = (start + end) / 2;
       simgrid::mc::Variable* current_var = &info->global_variables[cursor];
     while (start <= end) {
       unsigned int cursor = (start + end) / 2;
       simgrid::mc::Variable* current_var = &info->global_variables[cursor];

-      int cmp = strcmp(current_var->name.c_str(), name);
+      int cmp = current_var->name.compare(name);

       if (cmp == 0) {
         info->global_variables.erase(
           info->global_variables.begin() + cursor);
       if (cmp == 0) {
         info->global_variables.erase(
           info->global_variables.begin() + cursor);


@@ -202,7 +202,7 @@ static void mc_ignore_local_variable_in_scope(const char *var_name,
       int cursor = (start + end) / 2;
       simgrid::mc::Variable* current_var = &scope->variables[cursor];
 
       int cursor = (start + end) / 2;
       simgrid::mc::Variable* current_var = &scope->variables[cursor];
 

-      int compare = strcmp(current_var->name.c_str(), var_name);
+      int compare = current_var->name.compare(var_name);

       if (compare == 0) {
         // Variable found, remove it:
         scope->variables.erase(scope->variables.begin() + cursor);
       if (compare == 0) {
         // Variable found, remove it:
         scope->variables.erase(scope->variables.begin() + cursor);