Remove unused type definitions.

[simgrid.git] / src / surf / HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index d7cfc9b..628569b 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -6,11 +6,11 @@
 #ifndef SURF_HOST_INTERFACE_HPP_
 #define SURF_HOST_INTERFACE_HPP_
 
 #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/PropertyHolder.hpp"

+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/network_interface.hpp"

 
 #include <vector>
 
 
 #include <vector>
 


@@ -29,7 +29,7 @@ class XBT_PRIVATE HostModel : public kernel::resource::Model {
 public:
   HostModel() : Model(Model::UpdateAlgo::FULL) {}
 
 public:
   HostModel() : Model(Model::UpdateAlgo::FULL) {}
 

-  virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*> host_list,
+  virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,

                                                      const double* flops_amount, const double* bytes_amount,
                                                      double rate);
 };
                                                      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<const char*> get_attached_storages();
 
   /** @brief Get the vector of storages (by names) attached to the Host */
   virtual std::vector<const char*> get_attached_storages();
 

-  std::map<std::string, simgrid::surf::StorageImpl*> storage_;
-  simgrid::s4u::Host* piface_ = nullptr;
+  std::map<std::string, kernel::resource::StorageImpl*> storage_;
+  s4u::Host* piface_ = nullptr;

 
   void turn_on();
   void turn_off();
 
   void turn_on();
   void turn_off();