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 branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
include
/
surf
/
surf.hpp
diff --git
a/src/include/surf/surf.hpp
b/src/include/surf/surf.hpp
index
e6699b1
..
410508c
100644
(file)
--- a/
src/include/surf/surf.hpp
+++ b/
src/include/surf/surf.hpp
@@
-11,14
+11,12
@@
/** @ingroup SURF_models
* @brief The CPU model object for the physical machine layer
*/
/** @ingroup SURF_models
* @brief The CPU model object for the physical machine layer
*/
-XBT_PUBLIC_DATA simgrid::
surf
::CpuModel* surf_cpu_model_pm;
+XBT_PUBLIC_DATA simgrid::
kernel::resource
::CpuModel* surf_cpu_model_pm;
/** @ingroup SURF_models
* @brief The CPU model object for the virtual machine layer
*/
/** @ingroup SURF_models
* @brief The CPU model object for the virtual machine layer
*/
-XBT_PUBLIC_DATA simgrid::surf::CpuModel* surf_cpu_model_vm;
-
-XBT_PUBLIC_DATA simgrid::surf::StorageModel* surf_storage_model;
+XBT_PUBLIC_DATA simgrid::kernel::resource::CpuModel* surf_cpu_model_vm;
/** @ingroup SURF_models
* @brief The host model
/** @ingroup SURF_models
* @brief The host model