Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / include / simgrid / s4u / host.hpp

diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index b197b72..3fcc5d9 100644 (file)
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -59,6 +59,8 @@ public:
 
   /** Retrieves an host from its name, or return nullptr */
   static Host* by_name_or_null(const char* name);
+  /** Retrieves an host from its name, or return nullptr */
+  static Host* by_name_or_null(std::string name);
   /** Retrieves an host from its name, or die */
   static s4u::Host *by_name(std::string name);
   /** Retrieves the host on which the current actor is running */
@@ -90,8 +92,6 @@ public:
   int pstatesCount() const;
   void setPstate(int pstate_index);
   int pstate();
-  virtual void parameters(vm_params_t params);
-  virtual void setParameters(vm_params_t params);
   xbt_dict_t mountedStoragesAsDict(); // HACK
   xbt_dynar_t attachedStorages();