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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 8fc490d98b..09a183fa35 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -7,55 +7,80 @@
 #ifndef SG_PLATF_TYPES_H
 #define SG_PLATF_TYPES_H
 
-#include <xbt.h>
-
 #ifdef __cplusplus
 
+#include <boost/intrusive_ptr.hpp>
+
 namespace simgrid {
   namespace s4u {
+    class As;
+    class Host;
+    class Mailbox;
+  }
+  namespace kernel {
+     namespace activity {
+       class ActivityImpl;
+     }
+     namespace routing {
+       class NetCard;
+     }
+  }
+  namespace simix {
     class Host;
   }
   namespace surf {
     class Resource;
     class Cpu;
-    class NetCard;
-    class As;
     class Link;
   }
   namespace trace_mgr {
+    class trace;
     class future_evt_set;
   }
 }
 
+typedef simgrid::s4u::As simgrid_As;
 typedef simgrid::s4u::Host simgrid_Host;
-typedef simgrid::surf::As surf_As;
+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;
+
+typedef simgrid::simix::Host *smx_host_priv_t;
+
 
 #else
 
+typedef struct simgrid_As   simgrid_As;
 typedef struct simgrid_Host simgrid_Host;
-typedef struct surf_As surf_As;
+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;
+
+typedef struct simix_Host *smx_host_priv_t;
 #endif
 
+typedef simgrid_As *AS_t;
 typedef simgrid_Host* sg_host_t;
-typedef surf_As *AS_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:
-typedef xbt_dictelm_t sg_storage_t;
+typedef struct s_xbt_dictelm *sg_storage_t;
 
-typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
+typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
 
-typedef void *sg_routing_link_t; /* FIXME:The actual type is model-dependent so use void* instead*/
+typedef struct s_smx_simcall s_smx_simcall_t;
+typedef struct s_smx_simcall* smx_simcall_t;
 
 typedef enum {
   SURF_LINK_FULLDUPLEX = 2,