X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f3527d281baac664d10ce7086e0d0138e1389d7..aec830b8423c13c5c31e3db71361a449bfacd8ed:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 59da83b254..0549d1dda2 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -85,7 +84,7 @@ namespace simgrid { { double minRes = Model::nextOccuringEventFull(now); - for (Action const& action : *getRunningActionSet()) { + for (kernel::resource::Action const& action : *getRunningActionSet()) { const NetworkAction& net_action = static_cast(action); if (net_action.latency_ > 0) minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_); @@ -202,7 +201,8 @@ namespace simgrid { for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... - Resource* resource = static_cast(getVariable()->get_constraint(i)->get_id()); + kernel::resource::Resource* resource = + static_cast(getVariable()->get_constraint(i)->get_id()); LinkImpl* link = dynamic_cast(resource); if (link != nullptr) retlist.push_back(link);