X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54f9d48567e65bd17b9ad3544b5aad57bef54463..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/surf/HostImpl.hpp diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index d7cfc9bbfa..628569bf2d 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -6,11 +6,11 @@ #ifndef SURF_HOST_INTERFACE_HPP_ #define SURF_HOST_INTERFACE_HPP_ -#include "StorageImpl.hpp" -#include "cpu_interface.hpp" -#include "network_interface.hpp" -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/actor/ActorImpl.hpp" #include "src/surf/PropertyHolder.hpp" +#include "src/surf/StorageImpl.hpp" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/network_interface.hpp" #include @@ -29,7 +29,7 @@ class XBT_PRIVATE HostModel : public kernel::resource::Model { public: HostModel() : Model(Model::UpdateAlgo::FULL) {} - virtual kernel::resource::Action* execute_parallel(const std::vector host_list, + virtual kernel::resource::Action* execute_parallel(const std::vector& host_list, const double* flops_amount, const double* bytes_amount, double rate); }; @@ -50,8 +50,8 @@ public: /** @brief Get the vector of storages (by names) attached to the Host */ virtual std::vector get_attached_storages(); - std::map storage_; - simgrid::s4u::Host* piface_ = nullptr; + std::map storage_; + s4u::Host* piface_ = nullptr; void turn_on(); void turn_off();