normalize s_type class

[simgrid.git] / src / instr / instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index 88c9d5d..a76ed9a 100644 (file)
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -88,12 +88,12 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
     char as_typename[INSTR_DEFAULT_STR_SIZE];
     snprintf (as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", newContainer->level);
     if (newContainer->father){
-      newContainer->type = s_type::s_type_get_or_null (as_typename, newContainer->father->type);
+      newContainer->type = s_type::getOrNull (as_typename, newContainer->father->type);
       if (newContainer->type == nullptr){
-        newContainer->type = s_type::s_type_container_new (as_typename, newContainer->father->type);
+        newContainer->type = s_type::containerNew (as_typename, newContainer->father->type);
       }
     }else{
-      newContainer->type = s_type::s_type_container_new ("0", nullptr);
+      newContainer->type = s_type::containerNew ("0", nullptr);
     }
   }else{
     //otherwise, the name is its kind
@@ -124,9 +124,9 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
         THROWF (tracing_error, 0, "new container kind is unknown.");
         break;
     }
-    type_t type = s_type::s_type_get_or_null (typeNameBuff, newContainer->father->type);
+    type_t type = s_type::getOrNull (typeNameBuff, newContainer->father->type);
     if (type == nullptr){
-      newContainer->type = s_type::s_type_container_new (typeNameBuff, newContainer->father->type);
+      newContainer->type = s_type::containerNew (typeNameBuff, newContainer->father->type);
     }else{
       newContainer->type = type;
     }