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
surf_parse_error() never returns, remove dead code after that.
[simgrid.git]
/
src
/
kernel
/
routing
/
EmptyZone.cpp
diff --git
a/src/kernel/routing/EmptyZone.cpp
b/src/kernel/routing/EmptyZone.cpp
index
f4b386a
..
bd04471
100644
(file)
--- a/
src/kernel/routing/EmptyZone.cpp
+++ b/
src/kernel/routing/EmptyZone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
9
. 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. */
@@
-7,7
+7,7
@@
#include <xbt/graph.h>
#include <xbt/log.h>
#include <xbt/graph.h>
#include <xbt/log.h>
-#include "s
rc
/kernel/routing/EmptyZone.hpp"
+#include "s
imgrid
/kernel/routing/EmptyZone.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
@@
-15,14
+15,15
@@
namespace simgrid {
namespace kernel {
namespace routing {
namespace kernel {
namespace routing {
-EmptyZone::EmptyZone(NetZone* father, std::string name) : NetZoneImpl(father, name)
+EmptyZone::EmptyZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+ : NetZoneImpl(father, std::move(name), netmodel)
{
}
EmptyZone::~EmptyZone() = default;
{
}
EmptyZone::~EmptyZone() = default;
-void EmptyZone::get
G
raph(xbt_graph_t /*graph*/, std::map<std::string, xbt_node_t>* /*nodes*/,
- std::map<std::string, xbt_edge_t>* /*edges*/)
+void EmptyZone::get
_g
raph(xbt_graph_t /*graph*/, std::map<std::string, xbt_node_t>* /*nodes*/,
+
std::map<std::string, xbt_edge_t>* /*edges*/)
{
XBT_ERROR("No routing no graph");
}
{
XBT_ERROR("No routing no graph");
}