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;
class MailboxImpl;
}
namespace lmm {
-class s_lmm_element_t;
+class Element;
class Variable;
class Constraint;
class ConstraintLight;
-class s_lmm_system_t;
+class System;
}
namespace routing {
class NetPoint;
+ class NetZoneImpl;
}
}
namespace simix {
using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
class Host;
- class MutexImpl;
}
namespace surf {
class Resource;
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 const simgrid::kernel::lmm::s_lmm_element_t* const_lmm_element_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::s_lmm_system_t* lmm_system_t;
+typedef simgrid::kernel::lmm::System* lmm_system_t;
#else