A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP stop using const char* in C++ layers
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
09d82fd
..
ac4897a
100644
(file)
--- 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};
s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr};
- simgrid::surf::Model
*getModel() {return model_;
}
+ simgrid::surf::Model
* getModel() { return model_;
}
protected:
ActionList* stateSet_;
protected:
ActionList* stateSet_;
@@
-382,10
+382,10
@@
public:
virtual ~Resource();
/** @brief Get the Model of the current Resource */
virtual ~Resource();
/** @brief Get the Model of the current Resource */
- Model
*getM
odel() const;
+ Model
* m
odel() const;
/** @brief Get the name of the current Resource */
/** @brief Get the name of the current Resource */
- const char
*getN
ame() const;
+ const char
* cn
ame() const;
bool operator==(const Resource &other) 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) */
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;
};
protected:
const lmm_constraint_t constraint_ = nullptr;
};
@@
-430,7
+431,7
@@
namespace std {
{
std::size_t operator()(const simgrid::surf::Resource& r) const
{
{
std::size_t operator()(const simgrid::surf::Resource& r) const
{
- return (std::size_t) xbt_str_hash(r.
getN
ame());
+ return (std::size_t) xbt_str_hash(r.
cn
ame());
}
};
}
}
};
}