tend to the google coding standards in all S4U API

[simgrid.git] / src / mc / mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index ff841f7..0bcc7ea 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -3,22 +3,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <cassert>
-#include <cstddef>
-#include <cstdlib>
+#include "simgrid/s4u/Host.hpp"
 
-#include <memory>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include <xbt/log.h>
-#include <xbt/str.h>
-#include <xbt/swag.h>
-
-#include <simgrid/s4u/host.hpp>
-
-#include "src/simix/smx_private.h"
 #include "src/mc/mc_smx.h"
 #include "src/mc/ModelChecker.hpp"
 
@@ -159,7 +145,7 @@ smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 const char* MC_smx_actor_get_host_name(smx_actor_t actor)
 {
   if (mc_model_checker == nullptr)
-    return actor->host->cname();
+    return actor->host->getCname();
 
   simgrid::mc::Process* process = &mc_model_checker->process();
 
@@ -179,7 +165,7 @@ const char* MC_smx_actor_get_host_name(smx_actor_t actor)
     ~fake_host() {}
   };
   fake_host foo;
-  const size_t offset = (char*) &foo.host.name() - (char*) &foo.host;
+  const size_t offset = (char*)&foo.host.getName() - (char*)&foo.host;
 
   // Read the simgrid::xbt::string in the MCed process:
   simgrid::mc::ActorInformation* info     = actor_info_cast(actor);
@@ -206,7 +192,7 @@ const char* MC_smx_actor_get_name(smx_actor_t actor)
 }
 
 #if HAVE_SMPI
-int MC_smpi_process_count(void)
+int MC_smpi_process_count()
 {
   if (mc_model_checker == nullptr)
     return smpi_process_count();
@@ -217,7 +203,7 @@ int MC_smpi_process_count(void)
 }
 #endif
 
-unsigned long MC_smx_get_maxpid(void)
+unsigned long MC_smx_get_maxpid()
 {
   unsigned long maxpid;
   mc_model_checker->process().read_variable("simix_process_maxpid",