X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6badbbf58554a35b03f58509b0b18cf606c38f5e..1bd3b1e9e02dd5662a771c1b382cfa1d1d9a2e08:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 2961972572..b910d90c4f 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -12,25 +12,26 @@ #ifdef __cplusplus namespace simgrid { -class Host; + namespace s4u { + class Host; + } + namespace surf { + class Cpu; + class NetCard; + class As; + class Link; + } + namespace trace_mgr { + class future_evt_set; + } } -namespace simgrid { -namespace surf { - -class Cpu; -class NetCard; -class As; -class Link; - -} -} - -typedef simgrid::Host simgrid_Host; +typedef simgrid::s4u::Host simgrid_Host; typedef simgrid::surf::Cpu surf_Cpu; typedef simgrid::surf::NetCard surf_NetCard; typedef simgrid::surf::As surf_As; typedef simgrid::surf::Link Link; +typedef simgrid::trace_mgr::future_evt_set sg_future_evt_set; #else @@ -39,13 +40,14 @@ typedef struct surf_Cpu surf_Cpu; typedef struct surf_NetCard surf_NetCard; typedef struct surf_As surf_As; typedef struct Link Link; - +typedef struct future_evt_set sg_future_evt_set; #endif typedef simgrid_Host* sg_host_t; typedef surf_Cpu *surf_cpu_t; typedef surf_NetCard *sg_netcard_t; typedef surf_As *AS_t; +typedef sg_future_evt_set *sg_future_evt_set_t; // Types which are in fact dictelmt: typedef xbt_dictelm_t sg_storage_t;