X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1cf006c096c7c723185f01183938a85b437e925..68bf973c759c6eef597da8349276be4b60a6d124:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 3b962734bd..0a082a69d0 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -30,6 +30,8 @@ namespace activity {
   using ExecImplPtr = boost::intrusive_ptr<ExecImpl>;
   class IoImpl;
   using IoImplPtr = boost::intrusive_ptr<IoImpl>;
+  class MutexImpl;
+  using MutexImplPtr = boost::intrusive_ptr<MutexImpl>;
   class RawImpl;
   using RawImplPtr = boost::intrusive_ptr<RawImpl>;
   class SleepImpl;
@@ -38,23 +40,23 @@ namespace activity {
   class MailboxImpl;
 }
 namespace lmm {
-class s_lmm_element_t;
-class s_lmm_variable_t;
-class s_lmm_constraint_t;
-class s_lmm_constraint_light_t;
-class s_lmm_system_t;
+class Element;
+class Variable;
+class Constraint;
+class ConstraintLight;
+class System;
 }
 namespace routing {
   class NetPoint;
+  class NetZoneImpl;
 }
 }
 namespace simix {
   class ActorImpl;
   using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
   class Host;
-
-  class MutexImpl;
 }
+
 namespace surf {
   class Resource;
   class Cpu;
@@ -83,15 +85,16 @@ typedef simgrid::trace_mgr::trace tmgr_Trace;
 
 typedef simgrid::kernel::context::Context* smx_context_t;
 typedef simgrid::simix::ActorImpl* smx_actor_t;
-typedef simgrid::simix::MutexImpl* smx_mutex_t;
+typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t;
 typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t;
 typedef simgrid::surf::StorageImpl* surf_storage_t;
 
-typedef simgrid::kernel::lmm::s_lmm_element_t* lmm_element_t;
-typedef simgrid::kernel::lmm::s_lmm_variable_t* lmm_variable_t;
-typedef simgrid::kernel::lmm::s_lmm_constraint_t* lmm_constraint_t;
-typedef simgrid::kernel::lmm::s_lmm_constraint_light_t* lmm_constraint_light_t;
-typedef simgrid::kernel::lmm::s_lmm_system_t* lmm_system_t;
+typedef simgrid::kernel::lmm::Element* lmm_element_t;
+typedef const simgrid::kernel::lmm::Element* const_lmm_element_t;
+typedef simgrid::kernel::lmm::Variable* lmm_variable_t;
+typedef simgrid::kernel::lmm::Constraint* lmm_constraint_t;
+typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t;
+typedef simgrid::kernel::lmm::System* lmm_system_t;
 
 #else
 
@@ -136,19 +139,6 @@ typedef enum { // FIXME: move this to s4u::Link; make it an enum class
   SURF_LINK_FATPIPE    = 0
 } e_surf_link_sharing_policy_t;
 
-typedef enum { // FIXME: move this away; make it an enum class
-  SURF_TRACE_CONNECT_KIND_HOST_AVAIL = 4,
-  SURF_TRACE_CONNECT_KIND_SPEED      = 3,
-  SURF_TRACE_CONNECT_KIND_LINK_AVAIL = 2,
-  SURF_TRACE_CONNECT_KIND_BANDWIDTH  = 1,
-  SURF_TRACE_CONNECT_KIND_LATENCY    = 0
-} e_surf_trace_connect_kind_t;
-
-typedef enum { // FIXME: move this to s4u::Actor; make it an enum class
-  SURF_ACTOR_ON_FAILURE_DIE     = 1,
-  SURF_ACTOR_ON_FAILURE_RESTART = 0
-} e_surf_process_on_failure_t;
-
 /** @ingroup m_datatypes_management_details
  * @brief Type for any simgrid size
  */