give simgrid::Host a p_cpu field instead of relying on extensions for non-optional...

[simgrid.git] / include / simgrid / Host.hpp

diff --git a/include/simgrid/Host.hpp b/include/simgrid/Host.hpp
index e914303..6e102c2 100644 (file)
--- a/include/simgrid/Host.hpp
+++ b/include/simgrid/Host.hpp
@@ -7,22 +7,29 @@
 #ifndef SIMGRID_HOST_HPP
 #define SIMGRID_HOST_HPP
 
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <xbt/base.h>
-#include <xbt/Lib.hpp>
+#include <xbt/string.hpp>
+#include <xbt/Extendable.hpp>
 
 namespace simgrid {
 
-XBT_PUBLIC_CLASS Host : public simgrid::xbt::Lib<Host> {
+XBT_PUBLIC_CLASS Host :
+       public simgrid::xbt::Extendable<Host> {
+
+       public:
+       surf::Cpu *p_cpu;
+
 private:
-  std::string id_;
+  simgrid::xbt::string name_;
 public:
-  Host(std::string id);
+  Host(std::string const& name);
   ~Host();
-  std::string const& id() const { return id_; }
+  simgrid::xbt::string const& getName() const { return name_; }
   static Host* by_name_or_null(const char* name);
   static Host* by_name_or_create(const char* name);
 };