X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f3527d281baac664d10ce7086e0d0138e1389d7..0f5828869a4c6d79018e8eca27a10d0fe51979e5:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 156c99355a..8f71d15f34 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>;
@@ -47,9 +48,18 @@ class Constraint;
 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 {
@@ -59,7 +69,6 @@ namespace simix {
 }
 
 namespace surf {
-  class Resource;
   class Cpu;
   class LinkImpl;
   class HostImpl;
@@ -81,7 +90,7 @@ typedef simgrid::s4u::NetZone s4u_NetZone;
 typedef simgrid::s4u::VirtualMachine s4u_VM;
 typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
 typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::surf::Resource surf_Resource;
+typedef simgrid::kernel::resource::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
 
 typedef simgrid::kernel::context::Context* smx_context_t;
@@ -93,7 +102,6 @@ typedef simgrid::surf::StorageImpl* surf_storage_t;
 typedef simgrid::kernel::lmm::Element* lmm_element_t;
 typedef const simgrid::kernel::lmm::Element* const_lmm_element_t;
 typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t;
-typedef simgrid::kernel::lmm::System* lmm_system_t;
 
 #else
 
@@ -123,6 +131,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;
@@ -148,6 +157,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 */