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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
host_clm03.hpp
diff --git
a/src/surf/host_clm03.hpp
b/src/surf/host_clm03.hpp
index 4c66fc7da65f4f86852cd1ca3e2ee0c92934924d..1e97a2d65b1ce0e606cd52b87fc6f9495e22c642 100644
(file)
--- a/
src/surf/host_clm03.hpp
+++ b/
src/surf/host_clm03.hpp
@@
-1,15
+1,9
@@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <xbt/base.h>
-
-#include "storage_interface.hpp"
-#include "cpu_interface.hpp"
-#include "host_interface.hpp"
-#include "network_interface.hpp"
+#include "src/surf/HostImpl.hpp"
#ifndef SURF_HOST_CLM03_HPP_
#define SURF_HOST_CLM03_HPP_
#ifndef SURF_HOST_CLM03_HPP_
#define SURF_HOST_CLM03_HPP_
@@
-21,19
+15,11
@@
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-class XBT_PRIVATE HostCLM03Model;
-
-/*********
- * Model *
- *********/
-
-class HostCLM03Model : public HostModel {
+class XBT_PRIVATE HostCLM03Model : public HostModel {
public:
public:
- HostCLM03Model(): HostModel(){}
- ~HostCLM03Model() {}
+ HostCLM03Model();
double next_occuring_event(double now) override;
double next_occuring_event(double now) override;
-
- void updateActionsState(double now, double delta) override;
+ void update_actions_state(double now, double delta) override;
};
}
}
};
}
}