further snake_case s4u::Actor

[simgrid.git] / include / simgrid / forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 0b77f99..5fbff21 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,17 +9,14 @@
 #ifdef __cplusplus
 
 #include <simgrid/s4u/forward.hpp>
-#include <xbt/base.h>
-
-#include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
+namespace config {
+template <class T> class Flag;
+}
+
 namespace kernel {
 class EngineImpl;
-namespace context {
-class Context;
-class ContextFactory;
-}
 namespace actor {
 class ActorImpl;
 using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
@@ -45,6 +42,10 @@ namespace activity {
 
   class MailboxImpl;
 }
+namespace context {
+class Context;
+class ContextFactory;
+} // namespace context
 namespace lmm {
 class Element;
 class Variable;
@@ -57,6 +58,8 @@ class Action;
 class Model;
 class Resource;
 class TraceEvent;
+class LinkImpl;
+class NetworkAction;
 }
 namespace routing {
 class ClusterCreationArgs;
@@ -65,23 +68,24 @@ class NetPoint;
 class NetZoneImpl;
 class RouteCreationArgs;
 }
-}
+} // namespace kernel
 namespace simix {
   class Host;
 }
-
 namespace surf {
   class Cpu;
-  class LinkImpl;
+  class CpuModel;
   class HostImpl;
+  class HostModel;
   class StorageImpl;
   class StorageType;
+  class StorageModel;
 }
 namespace trace_mgr {
   class trace;
   class future_evt_set;
 }
-}
+} // namespace simgrid
 
 typedef simgrid::s4u::Actor s4u_Actor;
 typedef simgrid::s4u::Host s4u_Host;
@@ -91,8 +95,7 @@ typedef simgrid::s4u::Storage s4u_Storage;
 typedef simgrid::s4u::NetZone s4u_NetZone;
 typedef simgrid::s4u::VirtualMachine s4u_VM;
 typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
-typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::trace_mgr::trace tmgr_Trace;
+typedef simgrid::trace_mgr::trace* tmgr_trace_t;
 
 typedef simgrid::kernel::context::Context* smx_context_t;
 typedef simgrid::kernel::actor::ActorImpl* smx_actor_t;
@@ -100,9 +103,6 @@ typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t;
 typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t;
 typedef simgrid::surf::StorageImpl* surf_storage_t;
 
-typedef const simgrid::kernel::lmm::Element* const_lmm_element_t;
-typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t;
-
 #else
 
 typedef struct s4u_Actor s4u_Actor;
@@ -113,8 +113,6 @@ typedef struct s4u_Storage s4u_Storage;
 typedef struct s4u_NetZone s4u_NetZone;
 typedef struct s4u_VM s4u_VM;
 typedef struct kernel_Activity* smx_activity_t;
-typedef struct routing_NetPoint routing_NetPoint;
-typedef struct Trace tmgr_Trace;
 
 typedef struct s_smx_context* smx_context_t;
 typedef struct s_smx_actor* smx_actor_t;
@@ -132,18 +130,8 @@ typedef s4u_File* sg_file_t;
 typedef s4u_VM* sg_vm_t;
 typedef s4u_Actor* sg_actor_t;
 
-typedef routing_NetPoint* sg_netpoint_t;
-
-typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
-
 typedef struct s_smx_simcall* smx_simcall_t;
 
-typedef enum { // FIXME: move this to s4u::Link; make it an enum class
-  SURF_LINK_SPLITDUPLEX = 2,
-  SURF_LINK_SHARED      = 1,
-  SURF_LINK_FATPIPE     = 0
-} e_surf_link_sharing_policy_t;
-
 /** @ingroup m_datatypes_management_details
  * @brief Type for any simgrid size
  */