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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 83d437ab77..610f34fe5c 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -13,22 +13,26 @@
 
 namespace simgrid {
   namespace s4u {
-    class As;
-    class Host;
-    class Mailbox;
+  class NetZone;
+  class Host;
+  class Mailbox;
   }
   namespace kernel {
      namespace activity {
        class ActivityImpl;
      }
      namespace routing {
-       class NetCard;
+     class NetPoint;
      }
   }
+  namespace simix {
+    class Host;
+  }
   namespace surf {
     class Resource;
     class Cpu;
     class Link;
+    class HostImpl;
   }
   namespace trace_mgr {
     class trace;
@@ -36,36 +40,39 @@ namespace simgrid {
   }
 }
 
-typedef simgrid::s4u::As simgrid_As;
+typedef simgrid::s4u::NetZone simgrid_NetZone;
 typedef simgrid::s4u::Host simgrid_Host;
-typedef boost::intrusive_ptr<simgrid::s4u::Mailbox> sg_mbox_t;
 typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
-typedef simgrid::kernel::routing::NetCard routing_NetCard;
+typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
 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_NetZone simgrid_NetZone;
 typedef struct simgrid_Host simgrid_Host;
-typedef struct simgrid_Mailbox *sg_mbox_t;
 typedef struct kernel_Activity kernel_Activity;
 typedef struct surf_Cpu surf_Cpu;
-typedef struct routing_NetCard routing_NetCard;
+typedef struct routing_NetPoint routing_NetPoint;
 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_NetZone* NetZone_t;
 typedef simgrid_Host* sg_host_t;
 
 typedef kernel_Activity *smx_activity_t;
 
 typedef surf_Cpu *surf_cpu_t;
-typedef routing_NetCard *sg_netcard_t;
+typedef routing_NetPoint* sg_netcard_t;
 typedef surf_Resource *sg_resource_t;
 
 // Types which are in fact dictelmt: