further trim the includes

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

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index daf878b..c4ccfb2 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -6,21 +6,14 @@
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
 
-#include <cstddef>
-
-#include <xbt.h>
-#include <memory>
-#include <utility>
-
 #include <boost/intrusive/list.hpp>
 
-#include <xbt/signal.hpp>
+#include "xbt/signal.hpp"
 
-#include "xbt/lib.h"
-#include "surf/surf_routing.h"
-#include "surf/surf.h"
 #include "src/surf/surf_private.h"
-#include "src/internal_config.h"
+#include "surf/surf.h"
+#include "surf/surf_routing.h"
+#include "xbt/str.h"
 
 #define NO_MAX_DURATION -1.0
 
@@ -114,13 +107,6 @@ public:
     not_in_the_system /**< Not in the system anymore. Why did you ask ? */
   };
 
-private:
-  /**
-   * @brief Common initializations for the constructors
-   */
-  void initialize(simgrid::surf::Model *model, double cost, bool failed,
-                  lmm_variable_t var = nullptr);
-
 public:
   /**
    * @brief Action constructor
@@ -383,14 +369,6 @@ namespace surf {
  */
 XBT_PUBLIC_CLASS Resource {
 public:
-  /**
-   * @brief Constructor of non-LMM Resources
-   *
-   * @param model Model associated to this Resource
-   * @param name The name of the Resource
-   */
-  Resource(Model *model, const char *name);
-
   /**
    * @brief Constructor of LMM Resources
    *
@@ -431,7 +409,7 @@ public:
   virtual void turnOff();
 
 private:
-  const char *name_;
+  std::string name_;
   Model *model_;
   bool isOn_ = true;
 
@@ -439,7 +417,7 @@ public: /* LMM */
   /** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */
   lmm_constraint_t getConstraint() const;
 protected:
-  lmm_constraint_t constraint_ = nullptr;
+  const lmm_constraint_t constraint_ = nullptr;
 };
 
 }