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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 9515436c61..82b6c583e9 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,50 +9,42 @@
 
 #ifdef __cplusplus
 
+#include "s4u/forward.hpp"
 #include "xbt/base.h"
 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
-namespace s4u {
-class Actor;
-class Comm;
-class Host;
-class Link;
-class Mailbox;
-class NetZone;
-
-XBT_PUBLIC(void) intrusive_ptr_release(Comm* c);
-XBT_PUBLIC(void) intrusive_ptr_add_ref(Comm* c);
-}
 namespace kernel {
 namespace activity {
-class ActivityImpl;
-     }
-     namespace routing {
-     class NetPoint;
-     }
-  }
-  namespace simix {
-    class Host;
-  }
-  namespace surf {
-    class Resource;
-    class Cpu;
-    class LinkImpl;
-    class HostImpl;
-    class StorageImpl;
-  }
-  namespace trace_mgr {
-    class trace;
-    class future_evt_set;
-  }
+  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 LinkImpl;
+  class HostImpl;
+  class StorageImpl;
+}
+namespace trace_mgr {
+  class trace;
+  class future_evt_set;
+}
 }
 
 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::activity::ActivityImpl* smx_activity_t;
 typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
 typedef simgrid::surf::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
@@ -63,7 +55,7 @@ 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 kernel_Activity* smx_activity_t;
 typedef struct routing_NetPoint routing_NetPoint;
 typedef struct surf_Resource surf_Resource;
 typedef struct Trace tmgr_Trace;
@@ -74,7 +66,6 @@ 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 routing_NetPoint* sg_netpoint_t;
 typedef surf_Resource *sg_resource_t;