X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43f7ca1cac5ab1858e318fdd6239d0a0c3b3d893..705d7f1d9bb048c715a17cd5e726dbdbbd6b6d71:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index c3c0cbc7f1..3fd32c572f 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;
@@ -37,9 +39,16 @@ namespace activity {
 
   class MailboxImpl;
 }
-
+namespace lmm {
+class Element;
+class Variable;
+class Constraint;
+class ConstraintLight;
+class System;
+}
 namespace routing {
   class NetPoint;
+  class NetZoneImpl;
 }
 }
 namespace simix {
@@ -47,7 +56,6 @@ namespace simix {
   using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
   class Host;
 
-  class MutexImpl;
 }
 namespace surf {
   class Resource;
@@ -55,7 +63,7 @@ namespace surf {
   class LinkImpl;
   class HostImpl;
   class StorageImpl;
-  class FileImpl;
+  class StorageType;
 }
 namespace trace_mgr {
   class trace;
@@ -77,9 +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::FileImpl* surf_file_t;
+typedef simgrid::surf::StorageImpl* surf_storage_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
 
@@ -99,6 +114,7 @@ typedef struct s_smx_context* smx_context_t;
 typedef struct s_smx_actor* smx_actor_t;
 typedef struct s_smx_mutex* smx_mutex_t;
 typedef struct s_smx_mailbox* smx_mailbox_t;
+typedef struct s_surf_storage* surf_storage_t;
 
 #endif