class ConstraintLight;
class System;
}
-namespace model {
+namespace resource {
+class Action;
+class Model;
class Resource;
}
namespace routing {
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;
*/
typedef long long sg_offset_t;
-typedef unsigned long aid_t;
+typedef long aid_t;
#endif /* SIMGRID_TYPES_H */