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 github.com:simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
routing
/
VivaldiZone.hpp
diff --git
a/src/kernel/routing/VivaldiZone.hpp
b/src/kernel/routing/VivaldiZone.hpp
index
e2a6e62
..
83fc6b2
100644
(file)
--- a/
src/kernel/routing/VivaldiZone.hpp
+++ b/
src/kernel/routing/VivaldiZone.hpp
@@
-47,7
+47,7
@@
class XBT_PRIVATE VivaldiZone : public ClusterZone {
public:
explicit VivaldiZone(NetZone* father, const char* name);
public:
explicit VivaldiZone(NetZone* father, const char* name);
- void setPeerLink(NetPoint* net
card, double bw_in, double bw_out, const char*
coord);
+ void setPeerLink(NetPoint* net
point, double bw_in, double bw_out, std::string
coord);
void getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t into, double* latency) override;
};
void getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t into, double* latency) override;
};
@@
-55,8
+55,8
@@
namespace vivaldi {
class XBT_PRIVATE Coords {
public:
static simgrid::xbt::Extension<NetPoint, Coords> EXTENSION_ID;
class XBT_PRIVATE Coords {
public:
static simgrid::xbt::Extension<NetPoint, Coords> EXTENSION_ID;
- explicit Coords(NetPoint* host,
const char*
str);
- virtual ~Coords();
+ explicit Coords(NetPoint* host,
std::string
str);
+ virtual ~Coords()
= default
;
std::vector<double> coords;
};
std::vector<double> coords;
};