Another attempt at fixing the Flag2 job of jenkins

[simgrid.git] / src / kernel / resource / HostImpl.hpp

diff --git a/src/kernel/resource/HostImpl.hpp b/src/kernel/resource/HostImpl.hpp
index eda907d..506a3d6 100644 (file)
--- a/src/kernel/resource/HostImpl.hpp
+++ b/src/kernel/resource/HostImpl.hpp
@@ -3,8 +3,8 @@
 /* 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. */
 
-#ifndef SURF_HOST_INTERFACE_HPP
-#define SURF_HOST_INTERFACE_HPP
+#ifndef SIMGRID_KERNEL_HOST_INTERFACE_HPP
+#define SIMGRID_KERNEL_HOST_INTERFACE_HPP
 
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/resource/CpuImpl.hpp"
@@ -18,8 +18,8 @@ namespace simgrid::kernel::resource {
  * Model *
  *********/
 
-/** @ingroup SURF_host_interface
- * @brief SURF Host model interface class
+/** @ingroup Model_host_interface
+ * @brief Host model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions
  */
 class XBT_PRIVATE HostModel : public Model {
@@ -29,15 +29,15 @@ public:
 
   virtual Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                                    const double* bytes_amount, double rate) = 0;
-  virtual Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
-                            double size)                                    = 0;
+  Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
+                            double size);
 };
 
 /************
  * Resource *
  ************/
-/** @ingroup SURF_host_interface
- * @brief SURF Host interface class
+/** @ingroup Model_host_interface
+ * @brief Host interface class
  * @details A host represents a machine with an aggregation of a Cpu, a RoutingEdge and Disk(s)
  */
 class XBT_PRIVATE HostImpl : public xbt::PropertyHolder, public actor::ObjectAccessSimcallItem {
@@ -49,7 +49,7 @@ class XBT_PRIVATE HostImpl : public xbt::PropertyHolder, public actor::ObjectAcc
   ActorList actor_list_;
   std::vector<actor::ProcessArg*> actors_at_boot_;
   s4u::Host piface_;
-  std::map<std::string, DiskImpl*, std::less<>> disks_;
+  std::map<std::string, DiskImplPtr, std::less<>> disks_;
   std::map<std::string, VirtualMachineImpl*, std::less<>> vms_;
   std::string name_{"noname"};
   routing::NetZoneImpl* englobing_zone_ = nullptr;