X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/808bc801011b8291383a7fb87669eb67f46f3a07..3539cb11977a91a6c4670f2db77cd8dc2ca970ae:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index ddf9531817..63f326971f 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -9,6 +9,8 @@ #ifdef __cplusplus +#include + namespace simgrid { namespace s4u { class As; @@ -17,7 +19,10 @@ namespace simgrid { } namespace kernel { namespace activity { - class Synchro; + class Synchro; + } + namespace routing { + class NetCard; } } namespace surf { @@ -25,9 +30,6 @@ namespace simgrid { class Cpu; class Link; } - namespace routing { - class NetCard; - } namespace trace_mgr { class trace; class future_evt_set; @@ -36,10 +38,10 @@ namespace simgrid { typedef simgrid::s4u::As simgrid_As; typedef simgrid::s4u::Host simgrid_Host; -typedef simgrid::s4u::Mailbox simgrid_Mailbox; +typedef boost::intrusive_ptr 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::routing::NetCard routing_NetCard; typedef simgrid::surf::Link Link; typedef simgrid::surf::Resource surf_Resource; typedef simgrid::trace_mgr::trace tmgr_Trace; @@ -48,7 +50,7 @@ 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 simgrid_Mailbox *sg_mbox_t; typedef struct simgrid_Synchro simgrid_Synchro; typedef struct surf_Cpu surf_Cpu; typedef struct routing_NetCard routing_NetCard; @@ -59,7 +61,6 @@ typedef struct Trace tmgr_Trace; typedef simgrid_As *AS_t; typedef simgrid_Host* sg_host_t; -typedef simgrid_Mailbox* sg_mbox_t; typedef simgrid_Synchro *smx_synchro_t;