X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6badbbf58554a35b03f58509b0b18cf606c38f5e..f94165f07b3250944bb7174ca6ac8085b67d7963:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 2961972572..ecab7aa6f9 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -12,40 +12,46 @@
 #ifdef __cplusplus
 
 namespace simgrid {
-class Host;
+  namespace s4u {
+    class Host;
+  }
+  namespace surf {
+    class Resource;
+    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::As surf_As;
 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::surf::Resource surf_Resource;
+typedef simgrid::trace_mgr::future_evt_set sg_future_evt_set;
 
 #else
 
 typedef struct simgrid_Host simgrid_Host;
+typedef struct surf_As surf_As;
 typedef struct surf_Cpu surf_Cpu;
 typedef struct surf_NetCard surf_NetCard;
-typedef struct surf_As surf_As;
+typedef struct surf_Resource surf_Resource;
 typedef struct Link Link;
-
+typedef struct future_evt_set sg_future_evt_set;
 #endif
 
 typedef simgrid_Host* sg_host_t;
+typedef surf_As *AS_t;
 typedef surf_Cpu *surf_cpu_t;
 typedef surf_NetCard *sg_netcard_t;
-typedef surf_As *AS_t;
+typedef surf_Resource *sg_resource_t;
+typedef sg_future_evt_set *sg_future_evt_set_t;
 
 // Types which are in fact dictelmt:
 typedef xbt_dictelm_t sg_storage_t;