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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index b13224ff97..7851a6022e 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -8,8 +8,9 @@
 
 #ifdef __cplusplus
 
-#include "s4u/forward.hpp"
-#include "xbt/base.h"
+#include <simgrid/s4u/forward.hpp>
+#include <xbt/base.h>
+
 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
@@ -22,8 +23,8 @@ class ContextFactory;
 namespace activity {
   class ActivityImpl;
   using ActivityImplPtr = boost::intrusive_ptr<ActivityImpl>;
-  XBT_PUBLIC(void) intrusive_ptr_add_ref(ActivityImpl* activity);
-  XBT_PUBLIC(void) intrusive_ptr_release(ActivityImpl* activity);
+  XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
+  XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
 
   class CommImpl;
   using CommImplPtr = boost::intrusive_ptr<CommImpl>;
@@ -48,11 +49,17 @@ class ConstraintLight;
 class System;
 }
 namespace resource {
+class Action;
+class Model;
 class Resource;
+class TraceEvent;
 }
 namespace routing {
-  class NetPoint;
-  class NetZoneImpl;
+class ClusterCreationArgs;
+class LinkCreationArgs;
+class NetPoint;
+class NetZoneImpl;
+class RouteCreationArgs;
 }
 }
 namespace simix {
@@ -125,6 +132,7 @@ typedef s4u_Link* sg_link_t;
 typedef s4u_Storage* sg_storage_t;
 typedef s4u_File* sg_file_t;
 typedef s4u_VM* sg_vm_t;
+typedef s4u_Actor* sg_actor_t;
 
 typedef routing_NetPoint* sg_netpoint_t;
 typedef surf_Resource *sg_resource_t;
@@ -150,6 +158,6 @@ typedef unsigned long long sg_size_t;
  */
 typedef long long sg_offset_t;
 
-typedef unsigned long aid_t;
+typedef long aid_t;
 
 #endif /* SIMGRID_TYPES_H */