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 #202 from Takishipp/clear_fct
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
cf5f486
..
249ee23
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-161,9
+161,8
@@
FILE *surf_fopen(const char *name, const char *mode)
/* search relative files in the path */
for (auto path_elm : surf_path) {
/* search relative files in the path */
for (auto path_elm : surf_path) {
- char* buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name);
- file = fopen(buff, mode);
- free(buff);
+ std::string buff = path_elm + FILE_DELIM + name;
+ file = fopen(buff.c_str(), mode);
if (file)
return file;
if (file)
return file;
@@
-379,9
+378,9
@@
void surf_exit()
delete stype->model_properties;
free(stype);
}
delete stype->model_properties;
free(stype);
}
- for (auto s : *simgrid::surf::StorageImpl::storages)
+ for (auto s : *simgrid::surf::StorageImpl::storages
Map()
)
delete s.second;
delete s.second;
- delete simgrid::surf::StorageImpl::storages;
+ delete simgrid::surf::StorageImpl::storages
Map()
;
for (auto model : *all_existing_models)
delete model;
for (auto model : *all_existing_models)
delete model;
@@
-739,8
+738,6
@@
void Action::setMaxDuration(double duration)
heapRemove(getModel()->getActionHeap());
}
heapRemove(getModel()->getActionHeap());
}
-void Action::gapRemove() {}
-
void Action::setSharingWeight(double weight)
{
XBT_IN("(%p,%g)", this, weight);
void Action::setSharingWeight(double weight)
{
XBT_IN("(%p,%g)", this, weight);