#ifdef __cplusplus
+#include <boost/intrusive_ptr.hpp>
+
namespace simgrid {
namespace s4u {
class As;
}
namespace kernel {
namespace activity {
- class Synchro;
+ class ActivityImpl;
+ }
+ namespace routing {
+ class NetCard;
}
}
+ namespace simix {
+ class Host;
+ }
namespace surf {
class Resource;
class Cpu;
class Link;
}
- namespace routing {
- class NetCard;
- }
namespace trace_mgr {
class trace;
class future_evt_set;
typedef simgrid::s4u::As simgrid_As;
typedef simgrid::s4u::Host simgrid_Host;
-typedef simgrid::s4u::Mailbox simgrid_Mailbox;
-typedef simgrid::kernel::activity::Synchro simgrid_Synchro;
+typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
+typedef simgrid::kernel::routing::NetCard routing_NetCard;
typedef simgrid::surf::Cpu surf_Cpu;
-typedef simgrid::routing::NetCard routing_NetCard;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::trace_mgr::trace tmgr_Trace;
+typedef simgrid::simix::Host *smx_host_priv_t;
+
+
#else
typedef struct simgrid_As simgrid_As;
typedef struct simgrid_Host simgrid_Host;
-typedef struct simgrid_Mailbox simgrid_Mailbox;
-typedef struct simgrid_Synchro simgrid_Synchro;
+typedef struct kernel_Activity kernel_Activity;
typedef struct surf_Cpu surf_Cpu;
typedef struct routing_NetCard routing_NetCard;
typedef struct surf_Resource surf_Resource;
typedef struct Link Link;
typedef struct Trace tmgr_Trace;
+
+typedef struct simix_Host *smx_host_priv_t;
#endif
typedef simgrid_As *AS_t;
typedef simgrid_Host* sg_host_t;
-typedef simgrid_Mailbox* sg_mbox_t;
-typedef simgrid_Synchro *smx_synchro_t;
+typedef kernel_Activity *smx_activity_t;
typedef surf_Cpu *surf_cpu_t;
typedef routing_NetCard *sg_netcard_t;