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
Use already existing simgrid::xbt::demangle().
[simgrid.git]
/
src
/
mc
/
mc_smx.cpp
diff --git
a/src/mc/mc_smx.cpp
b/src/mc/mc_smx.cpp
index
72b087c
..
8be69df
100644
(file)
--- a/
src/mc/mc_smx.cpp
+++ b/
src/mc/mc_smx.cpp
@@
-160,8
+160,8
@@
const char* MC_smx_actor_get_host_name(smx_actor_t actor)
*/
union fake_host {
simgrid::s4u::Host host;
*/
union fake_host {
simgrid::s4u::Host host;
- fake_host() {}
- ~fake_host() {}
+ fake_host() {
/* Nothing to do*/
}
+ ~fake_host() {
/* Nothing to do*/
}
};
fake_host foo;
const size_t offset = (char*)&foo.host.getName() - (char*)&foo.host;
};
fake_host foo;
const size_t offset = (char*)&foo.host.getName() - (char*)&foo.host;
@@
-184,7
+184,7
@@
const char* MC_smx_actor_get_name(smx_actor_t actor)
simgrid::mc::ActorInformation* info = actor_info_cast(actor);
if (info->name.empty()) {
simgrid::mc::ActorInformation* info = actor_info_cast(actor);
if (info->name.empty()) {
- simgrid::xbt::string_data string_data =
(simgrid::xbt::string_data&)actor->name
;
+ simgrid::xbt::string_data string_data =
simgrid::xbt::string::to_string_data(actor->name)
;
info->name = process->read_string(remote(string_data.data), string_data.len);
}
return info->name.c_str();
info->name = process->read_string(remote(string_data.data), string_data.len);
}
return info->name.c_str();