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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 67ba4588bc..8e83f4a421 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -47,7 +47,9 @@ class Constraint;
 class ConstraintLight;
 class System;
 }
-namespace model {
+namespace resource {
+class Action;
+class Model;
 class Resource;
 }
 namespace routing {
@@ -83,7 +85,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::kernel::model::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;
@@ -150,6 +152,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 */