X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1cb0397053536afc6c1ea8a99953806e71f5334..d8922a8d878de620b312b601417e286113135ae2:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 09d82fd5a8..ac4897a75d 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -216,7 +216,7 @@ public: s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr}; - simgrid::surf::Model *getModel() {return model_;} + simgrid::surf::Model* getModel() { return model_; } protected: ActionList* stateSet_; @@ -382,10 +382,10 @@ public: virtual ~Resource(); /** @brief Get the Model of the current Resource */ - Model *getModel() const; + Model* model() const; /** @brief Get the name of the current Resource */ - const char *getName() const; + const char* cname() const; bool operator==(const Resource &other) const; @@ -416,7 +416,8 @@ private: 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; + lmm_constraint_t constraint() const; + protected: const lmm_constraint_t constraint_ = nullptr; }; @@ -430,7 +431,7 @@ namespace std { { std::size_t operator()(const simgrid::surf::Resource& r) const { - return (std::size_t) xbt_str_hash(r.getName()); + return (std::size_t) xbt_str_hash(r.cname()); } }; }