X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/418ac8d537f356100767b8a21f65e16f7ba1d986..ccc3b6ac54d65bf59be965f90ea657deea9bafa8:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 437d7944bd..df24a155dd 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,19 +9,25 @@
 
 #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 ActivityImpl;
+     }
+     namespace routing {
+       class NetCard;
+     }
   }
   namespace surf {
     class Resource;
     class Cpu;
-    class NetCard;
     class Link;
   }
   namespace trace_mgr {
@@ -32,10 +38,9 @@ namespace simgrid {
 
 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 simgrid::kernel::activity::ActivityImpl kernel_Activity;
+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;
@@ -44,10 +49,9 @@ 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 kernel_Activity kernel_Activity;
 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;
@@ -55,12 +59,11 @@ 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 kernel_Activity *smx_activity_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:
@@ -68,6 +71,9 @@ typedef struct s_xbt_dictelm *sg_storage_t;
 
 typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
 
+typedef struct s_smx_simcall s_smx_simcall_t;
+typedef struct s_smx_simcall* smx_simcall_t;
+
 typedef enum {
   SURF_LINK_FULLDUPLEX = 2,
   SURF_LINK_SHARED = 1,