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
give a default value at field declaration, not everywhere in subclasses
[simgrid.git]
/
src
/
surf
/
surf_routing_full.cpp
diff --git
a/src/surf/surf_routing_full.cpp
b/src/surf/surf_routing_full.cpp
index
c7ef49a
..
2855d52
100644
(file)
--- a/
src/surf/surf_routing_full.cpp
+++ b/
src/surf/surf_routing_full.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
4
. The SimGrid Team.
+/* Copyright (c) 2009-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,14
+9,11
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
-/* Global vars */
-extern routing_platf_t routing_platf;
-
#define TO_ROUTE_FULL(i,j) p_routingTable[(i)+(j)*table_size]
AS_t model_full_create(void)
{
#define TO_ROUTE_FULL(i,j) p_routingTable[(i)+(j)*table_size]
AS_t model_full_create(void)
{
- return new AsFull();
+ return new
simgrid::surf::
AsFull();
}
void model_full_end(AS_t _routing)
}
void model_full_end(AS_t _routing)
@@
-25,7
+22,7
@@
void model_full_end(AS_t _routing)
sg_platf_route_cbarg_t e_route;
/* set utils vars */
sg_platf_route_cbarg_t e_route;
/* set utils vars */
-
AsFull *routing = static_cast<
AsFull*>(_routing);
+
simgrid::surf::AsFull *routing = static_cast<simgrid::surf::
AsFull*>(_routing);
int table_size = (int)xbt_dynar_length(routing->p_indexNetworkElm);
/* Create table if necessary */
int table_size = (int)xbt_dynar_length(routing->p_indexNetworkElm);
/* Create table if necessary */
@@
-48,6
+45,9
@@
void model_full_end(AS_t _routing)
}
}
}
}
+namespace simgrid {
+namespace surf {
+
AsFull::AsFull(){
p_routingTable = 0;
}
AsFull::AsFull(){
p_routingTable = 0;
}
@@
-267,6
+267,5
@@
void AsFull::parseRoute(sg_platf_route_cbarg_t route)
xbt_dynar_free(&route->link_list);
}
xbt_dynar_free(&route->link_list);
}
-
-
-
+}
+}