#ifdef __cplusplus
+#include <boost/intrusive_ptr.hpp>
+
namespace simgrid {
namespace s4u {
class As;
class Host;
class Mailbox;
}
- namespace simix {
- class Synchro;
+ namespace kernel {
+ namespace activity {
+ class Synchro;
+ }
+ namespace routing {
+ class NetCard;
+ }
}
namespace surf {
class Resource;
class Cpu;
- class NetCard;
class Link;
}
namespace trace_mgr {
typedef simgrid::s4u::As simgrid_As;
typedef simgrid::s4u::Host simgrid_Host;
-typedef simgrid::s4u::Mailbox simgrid_Mailbox;
-typedef simgrid::simix::Synchro simix_Synchro;
+typedef boost::intrusive_ptr<simgrid::s4u::Mailbox> sg_mbox_t;
+typedef simgrid::kernel::activity::Synchro simgrid_Synchro;
+typedef simgrid::kernel::routing::NetCard routing_NetCard;
typedef simgrid::surf::Cpu surf_Cpu;
-typedef simgrid::surf::NetCard surf_NetCard;
typedef simgrid::surf::Link Link;
typedef simgrid::surf::Resource surf_Resource;
typedef simgrid::trace_mgr::trace tmgr_Trace;
typedef struct simgrid_As simgrid_As;
typedef struct simgrid_Host simgrid_Host;
-typedef struct simgrid_Mailbox simgrid_Mailbox;
-typedef struct simix_Synchro simix_Synchro;
+typedef struct simgrid_Mailbox *sg_mbox_t;
+typedef struct simgrid_Synchro simgrid_Synchro;
typedef struct surf_Cpu surf_Cpu;
-typedef struct surf_NetCard surf_NetCard;
+typedef struct routing_NetCard routing_NetCard;
typedef struct surf_Resource surf_Resource;
typedef struct Link Link;
typedef struct Trace tmgr_Trace;
typedef simgrid_As *AS_t;
typedef simgrid_Host* sg_host_t;
-typedef simgrid_Mailbox* sg_mbox_t;
-typedef simix_Synchro *smx_synchro_t;
+typedef simgrid_Synchro *smx_synchro_t;
typedef surf_Cpu *surf_cpu_t;
-typedef surf_NetCard *sg_netcard_t;
+typedef routing_NetCard *sg_netcard_t;
typedef surf_Resource *sg_resource_t;
// Types which are in fact dictelmt: