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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 63f326971f..09a183fa35 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -19,12 +19,15 @@ namespace simgrid {
   }
   namespace kernel {
      namespace activity {
-       class Synchro;
+       class ActivityImpl;
      }
      namespace routing {
        class NetCard;
      }
   }
+  namespace simix {
+    class Host;
+  }
   namespace surf {
     class Resource;
     class Cpu;
@@ -38,31 +41,34 @@ namespace simgrid {
 
 typedef simgrid::s4u::As simgrid_As;
 typedef simgrid::s4u::Host simgrid_Host;
-typedef boost::intrusive_ptr<simgrid::s4u::Mailbox> sg_mbox_t;
-typedef simgrid::kernel::activity::Synchro simgrid_Synchro;
+typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
 typedef simgrid::kernel::routing::NetCard routing_NetCard;
 typedef simgrid::surf::Cpu surf_Cpu;
 typedef simgrid::surf::Link Link;
 typedef simgrid::surf::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
 
+typedef simgrid::simix::Host *smx_host_priv_t;
+
+
 #else
 
 typedef struct simgrid_As   simgrid_As;
 typedef struct simgrid_Host simgrid_Host;
-typedef struct simgrid_Mailbox *sg_mbox_t;
-typedef struct simgrid_Synchro simgrid_Synchro;
+typedef struct kernel_Activity kernel_Activity;
 typedef struct surf_Cpu surf_Cpu;
 typedef struct routing_NetCard routing_NetCard;
 typedef struct surf_Resource surf_Resource;
 typedef struct Link Link;
 typedef struct Trace tmgr_Trace;
+
+typedef struct simix_Host *smx_host_priv_t;
 #endif
 
 typedef simgrid_As *AS_t;
 typedef simgrid_Host* sg_host_t;
 
-typedef simgrid_Synchro *smx_synchro_t;
+typedef kernel_Activity *smx_activity_t;
 
 typedef surf_Cpu *surf_cpu_t;
 typedef routing_NetCard *sg_netcard_t;