Kill useless typedef s_smx_simcall_t.

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index e4ebfaf..0b77f99 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -136,7 +136,6 @@ typedef routing_NetPoint* sg_netpoint_t;
 
 typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
 
-typedef struct s_smx_simcall s_smx_simcall_t;
 typedef struct s_smx_simcall* smx_simcall_t;
 
 typedef enum { // FIXME: move this to s4u::Link; make it an enum class

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index c270a90..7191cb4 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -96,7 +96,7 @@ void RemoteClient::refresh_simix()
  *  @param process the MCed process
  *  @param req     the simcall (copied in the local process)
  */
-smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
+smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req)
 {
   xbt_assert(mc_model_checker != nullptr);
 

diff --git a/src/mc/mc_smx.hpp b/src/mc/mc_smx.hpp
index cebb749..19e76fc 100644 (file)
--- a/src/mc/mc_smx.hpp
+++ b/src/mc/mc_smx.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -39,7 +39,7 @@ extern "C" {
  *  @param process the MCed process
  *  @param req     the simcall (copied in the local process)
  */
-XBT_PRIVATE smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req);
+XBT_PRIVATE smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req);
 
 XBT_PRIVATE const char* MC_smx_actor_get_name(smx_actor_t p);
 XBT_PRIVATE const char* MC_smx_actor_get_host_name(smx_actor_t p);

diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp
index d14e7fd..11dcca6 100644 (file)
--- a/src/mc/mc_state.hpp
+++ b/src/mc/mc_state.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -106,14 +106,14 @@ public:
   Transition transition;
 
   /** The simcall which was executed, going out of that state */
-  s_smx_simcall_t executed_req;
+  s_smx_simcall executed_req;
 
   /* Internal translation of the executed_req simcall
    *
    * SIMCALL_COMM_TESTANY is translated to a SIMCALL_COMM_TEST
    * and SIMCALL_COMM_WAITANY to a SIMCALL_COMM_WAIT.
    */
-  s_smx_simcall_t internal_req;
+  s_smx_simcall internal_req;
 
   /* Can be used as a copy of the remote synchro object */
   simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> internal_comm;

diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index 7fb9ab5..f0fc0bc 100644 (file)
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -70,7 +70,7 @@ public:
 
   smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
   std::list<smx_activity_t> comms;          /* the current non-blocking communication synchros */
-  s_smx_simcall_t simcall;
+  s_smx_simcall simcall;
   void* userdata = nullptr;                      /* kept for compatibility, it should be replaced with moddata */
   std::vector<s_smx_process_exit_fun_t> on_exit; /* list of functions executed when the process dies */