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 simgrid::Host into simgrid::s4u::Host
[simgrid.git]
/
src
/
surf
/
cpu_cas01.hpp
diff --git
a/src/surf/cpu_cas01.hpp
b/src/surf/cpu_cas01.hpp
index
30b2bea
..
b7564d7
100644
(file)
--- a/
src/surf/cpu_cas01.hpp
+++ b/
src/surf/cpu_cas01.hpp
@@
-27,7
+27,7
@@
public:
CpuCas01Model();
~CpuCas01Model();
CpuCas01Model();
~CpuCas01Model();
- Cpu *createCpu(simgrid::Host *host, xbt_dynar_t speedPeak, int pstate,
+ Cpu *createCpu(simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak, int pstate,
double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
@@
-43,7
+43,7
@@
public:
class CpuCas01 : public Cpu {
public:
class CpuCas01 : public Cpu {
public:
- CpuCas01(CpuCas01Model *model, simgrid::Host *host, xbt_dynar_t speedPeak,
+ CpuCas01(CpuCas01Model *model, simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak,
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuCas01();
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuCas01();