X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e6612aab2a71e231fc5096b3836d8378364d72d..76081077f259960acb8a8624359ad2aa5c32ab46:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 18368a6da9..7f110d54a6 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -166,6 +166,9 @@ class NetworkAction; class DiskImpl; class DiskModel; } +namespace timer { +class Timer; +} namespace routing { class NetPoint; class NetZoneImpl; @@ -178,7 +181,6 @@ class Profile; } // namespace kernel namespace simix { class Host; - class Timer; } namespace surf { class HostImpl; @@ -208,7 +210,7 @@ using s4u_Disk = simgrid::s4u::Disk; using s4u_NetZone = simgrid::s4u::NetZone; using s4u_VM = simgrid::s4u::VirtualMachine; -using smx_timer_t = simgrid::simix::Timer*; +using smx_timer_t = simgrid::kernel::timer::Timer*; using smx_actor_t = simgrid::kernel::actor::ActorImpl*; using smx_activity_t = simgrid::kernel::activity::ActivityImpl*; using smx_cond_t = simgrid::kernel::activity::ConditionVariableImpl*;