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
Rewrite without delegated constructor.
[simgrid.git]
/
src
/
surf
/
network_constant.cpp
diff --git
a/src/surf/network_constant.cpp
b/src/surf/network_constant.cpp
index
7dd7d45
..
2b7ca29
100644
(file)
--- a/
src/surf/network_constant.cpp
+++ b/
src/surf/network_constant.cpp
@@
-4,6
+4,8
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_constant.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_constant.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
@@
-13,14
+15,15
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == nullptr);
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == nullptr);
- surf_network_model = new simgrid::
surf
::NetworkConstantModel();
+ surf_network_model = new simgrid::
kernel::resource
::NetworkConstantModel();
all_existing_models->push_back(surf_network_model);
}
namespace simgrid {
all_existing_models->push_back(surf_network_model);
}
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, double lat,
LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, double lat,
-
e_surf_link_sharing_policy_t
policy)
+
s4u::Link::SharingPolicy
policy)
{
xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
{
xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
@@
-89,4
+92,5
@@
void NetworkConstantAction::update_remains_lazy(double /*now*/)
THROW_IMPOSSIBLE;
}
}
THROW_IMPOSSIBLE;
}
}
+} // namespace kernel
}
}