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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index df24a155dd..a387d1cc31 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,26 +9,30 @@
 
 #ifdef __cplusplus
 
+#include "s4u/forward.hpp"
+#include "xbt/base.h"
 #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 kernel {
+namespace activity {
+class ActivityImpl;
+XBT_PUBLIC(void) intrusive_ptr_add_ref(ActivityImpl* activity);
+XBT_PUBLIC(void) intrusive_ptr_release(ActivityImpl* activity);
+}
+namespace routing {
+class NetPoint;
      }
   }
+  namespace simix {
+    class Host;
+  }
   namespace surf {
     class Resource;
     class Cpu;
-    class Link;
+    class LinkImpl;
+    class HostImpl;
+    class StorageImpl;
   }
   namespace trace_mgr {
     class trace;
@@ -36,34 +40,35 @@ namespace simgrid {
   }
 }
 
-typedef simgrid::s4u::As simgrid_As;
-typedef simgrid::s4u::Host simgrid_Host;
+typedef simgrid::s4u::Actor s4u_Actor;
+typedef simgrid::s4u::Host s4u_Host;
+typedef simgrid::s4u::Link s4u_Link;
+typedef simgrid::s4u::NetZone s4u_NetZone;
 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::kernel::routing::NetPoint routing_NetPoint;
 typedef simgrid::surf::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
 
 #else
 
-typedef struct simgrid_As   simgrid_As;
-typedef struct simgrid_Host simgrid_Host;
+typedef struct s4u_Actor s4u_Actor;
+typedef struct s4u_Host s4u_Host;
+typedef struct s4u_Link s4u_Link;
+typedef struct s4u_NetZone s4u_NetZone;
 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;
+
 #endif
 
-typedef simgrid_As *AS_t;
-typedef simgrid_Host* sg_host_t;
+typedef s4u_NetZone* sg_netzone_t;
+typedef s4u_Host* sg_host_t;
+typedef s4u_Link* sg_link_t;
 
 typedef kernel_Activity *smx_activity_t;
 
-typedef surf_Cpu *surf_cpu_t;
-typedef routing_NetCard *sg_netcard_t;
+typedef routing_NetPoint* sg_netpoint_t;
 typedef surf_Resource *sg_resource_t;
 
 // Types which are in fact dictelmt:
@@ -89,8 +94,8 @@ typedef enum {
 } e_surf_trace_connect_kind_t;
 
 typedef enum {
-  SURF_PROCESS_ON_FAILURE_DIE = 1,
-  SURF_PROCESS_ON_FAILURE_RESTART = 0
+  SURF_ACTOR_ON_FAILURE_DIE = 1,
+  SURF_ACTOR_ON_FAILURE_RESTART = 0
 } e_surf_process_on_failure_t;
 
 
@@ -104,4 +109,6 @@ typedef unsigned long long sg_size_t;
  */
 typedef long long sg_offset_t;
 
+typedef unsigned long aid_t;
+
 #endif