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
also change the namespace of kernel/resource/{Action,Model}
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
222720f
..
f45907e
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-29,7
+29,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke
* Utils *
*********/
* Utils *
*********/
-std::vector<s
urf_model_t>
* all_existing_models = nullptr; /* to destroy models correctly */
+std::vector<s
imgrid::kernel::resource::Model*>
* all_existing_models = nullptr; /* to destroy models correctly */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
std::vector<std::string> surf_path;
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
std::vector<std::string> surf_path;
@@
-307,7
+307,7
@@
void surf_init(int *argc, char **argv)
xbt_init(argc, argv);
if (not all_existing_models)
xbt_init(argc, argv);
if (not all_existing_models)
- all_existing_models = new std::vector<simgrid::
surf
::Model*>();
+ all_existing_models = new std::vector<simgrid::
kernel::resource
::Model*>();
if (not future_evt_set)
future_evt_set = new simgrid::trace_mgr::future_evt_set();
if (not future_evt_set)
future_evt_set = new simgrid::trace_mgr::future_evt_set();