X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9dcc23b08f5e5cc47936451000e5a863c6f5055..d3d4c51aace6f9daab7ee7bf664d9d56c81070f8:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 8e83f4a421..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 +#include + #include namespace simgrid { @@ -22,8 +23,8 @@ class ContextFactory; namespace activity { class ActivityImpl; using ActivityImplPtr = boost::intrusive_ptr; - 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; @@ -51,10 +52,14 @@ 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 { @@ -127,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;