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
fix NS3
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
515ce2c
..
48d8d1e
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-61,7
+61,7
@@
static void ns3_add_host(simgrid::s4u::Host& host)
static void ns3_add_netcard(simgrid::kernel::routing::NetCard* netcard)
{
static void ns3_add_netcard(simgrid::kernel::routing::NetCard* netcard)
{
- xbt_lib_set(as_router_lib, netcard->name(), NS3_ASR_LEVEL, new HostNs3());
+ xbt_lib_set(as_router_lib, netcard->name()
.c_str()
, NS3_ASR_LEVEL, new HostNs3());
}
#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
}
#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
@@
-115,8
+115,8
@@
static void create_ns3_topology(void)
simgrid::kernel::routing::Onelink *onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
simgrid::kernel::routing::Onelink *onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
- c
har *src = onelink->src_->name
();
- c
har *dst = onelink->dst_->name
();
+ c
onst char* src = onelink->src_->name().c_str
();
+ c
onst char* dst = onelink->dst_->name().c_str
();
simgrid::surf::LinkNS3 *link = static_cast<simgrid::surf::LinkNS3 *>(onelink->link_);
if (strcmp(src,dst) && (already_seen.find(link) == already_seen.end())) {
simgrid::surf::LinkNS3 *link = static_cast<simgrid::surf::LinkNS3 *>(onelink->link_);
if (strcmp(src,dst) && (already_seen.find(link) == already_seen.end())) {