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]
/
include
/
simgrid
/
kernel
/
routing
/
EmptyZone.hpp
diff --git
a/include/simgrid/kernel/routing/EmptyZone.hpp
b/include/simgrid/kernel/routing/EmptyZone.hpp
index
2ed304b
..
7240493
100644
(file)
--- a/
include/simgrid/kernel/routing/EmptyZone.hpp
+++ b/
include/simgrid/kernel/routing/EmptyZone.hpp
@@
-1,12
+1,13
@@
-/* Copyright (c) 2013-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-202
3
. 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. */
-#ifndef S
URF
_ROUTING_NONE_HPP_
-#define S
URF
_ROUTING_NONE_HPP_
+#ifndef S
IMGRID
_ROUTING_NONE_HPP_
+#define S
IMGRID
_ROUTING_NONE_HPP_
#include <simgrid/kernel/routing/NetZoneImpl.hpp>
#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <xbt/asserts.h>
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-21,12
+22,11
@@
namespace routing {
class XBT_PRIVATE EmptyZone : public NetZoneImpl {
public:
class XBT_PRIVATE EmptyZone : public NetZoneImpl {
public:
- explicit EmptyZone(const std::string& name);
- ~EmptyZone() override;
+ explicit EmptyZone(const std::string& name) : NetZoneImpl(name) {}
- void get_local_route(
NetPoint* src, NetPoint* dst, RouteCreationArgs
* into, double* latency) override
+ void get_local_route(
const NetPoint* src, const NetPoint* dst, Route
* into, double* latency) override
{
{
- /* There can't be route in an Empty zone */
+ xbt_die("There can't be route in an Empty zone");
}
void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* /*nodes*/,
}
void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* /*nodes*/,
@@
-36,4
+36,4
@@
public:
} // namespace kernel
} // namespace simgrid
} // namespace kernel
} // namespace simgrid
-#endif /* S
URF
_ROUTING_NONE_HPP_ */
+#endif /* S
IMGRID
_ROUTING_NONE_HPP_ */