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
Remove a few more commented lines of code.
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
f465a21
..
0d3c6fd
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-118,8
+118,12
@@
public:
/** @brief Destructor */
virtual ~Action();
/** @brief Destructor */
virtual ~Action();
- /** @brief Mark that the action is now finished */
- void finish();
+ /**
+ * @brief Mark that the action is now finished
+ *
+ * @param state the new [state](\ref simgrid::surf::Action::State) of the current Action
+ */
+ void finish(Action::State state);
/** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */
Action::State getState(); /**< get the state*/
/** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */
Action::State getState(); /**< get the state*/
@@
-363,7
+367,7
@@
public:
* @param name The name of the Resource
* @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
*/
* @param name The name of the Resource
* @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
*/
- Resource(Model *
model, const char *
name, lmm_constraint_t constraint);
+ Resource(Model *
model, const std::string&
name, lmm_constraint_t constraint);
virtual ~Resource();
virtual ~Resource();
@@
-412,13
+416,9
@@
protected:
}
namespace std {
}
namespace std {
- template <>
- struct hash<simgrid::surf::Resource>
- {
- std::size_t operator()(const simgrid::surf::Resource& r) const
- {
- return (std::size_t) xbt_str_hash(r.cname());
- }
+template <> class hash<simgrid::surf::Resource> {
+public:
+ std::size_t operator()(const simgrid::surf::Resource& r) const { return (std::size_t)xbt_str_hash(r.cname()); }
};
}
};
}