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
Merge pull request #259 from simgrid/configfix
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Activity.hpp
diff --git
a/include/simgrid/s4u/Activity.hpp
b/include/simgrid/s4u/Activity.hpp
index
b5ef0b4
..
c508d9d
100644
(file)
--- a/
include/simgrid/s4u/Activity.hpp
+++ b/
include/simgrid/s4u/Activity.hpp
@@
-61,17
+61,17
@@
public:
/** Put some user data onto the Activity */
Activity* setUserData(void* data)
{
/** Put some user data onto the Activity */
Activity* setUserData(void* data)
{
- user
D
ata_ = data;
+ user
_d
ata_ = data;
return this;
}
/** Retrieve the user data of the Activity */
return this;
}
/** Retrieve the user data of the Activity */
- void
*getUserData() { return userD
ata_; }
+ void
* getUserData() { return user_d
ata_; }
private:
simgrid::kernel::activity::ActivityImplPtr pimpl_ = nullptr;
e_s4u_activity_state_t state_ = inited;
double remains_ = 0;
private:
simgrid::kernel::activity::ActivityImplPtr pimpl_ = nullptr;
e_s4u_activity_state_t state_ = inited;
double remains_ = 0;
- void
*userData_
= nullptr;
+ void
* user_data_
= nullptr;
}; // class
}}; // Namespace simgrid::s4u
}; // class
}}; // Namespace simgrid::s4u