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] Use the pointers to simgrid::Host instead of looking by name
[simgrid.git]
/
src
/
surf
/
surf_routing_dijkstra.cpp
diff --git
a/src/surf/surf_routing_dijkstra.cpp
b/src/surf/surf_routing_dijkstra.cpp
index
50408cf
..
28ed732
100644
(file)
--- a/
src/surf/surf_routing_dijkstra.cpp
+++ b/
src/surf/surf_routing_dijkstra.cpp
@@
-36,16
+36,17
@@
static void graph_edge_data_free(void *e) // FIXME: useless code duplication
}
AS_t model_dijkstra_create(void){
}
AS_t model_dijkstra_create(void){
- return new AsDijkstra(0);
+ return new
simgrid::surf::
AsDijkstra(0);
}
AS_t model_dijkstracache_create(void){
}
AS_t model_dijkstracache_create(void){
- return new AsDijkstra(1);
+ return new
simgrid::surf::
AsDijkstra(1);
}
void model_dijkstra_both_end(AS_t as)
{
}
void model_dijkstra_both_end(AS_t as)
{
- AsDijkstra *THIS_AS = static_cast<AsDijkstra*>(as);
+ simgrid::surf::AsDijkstra *THIS_AS
+ = static_cast<simgrid::surf::AsDijkstra*>(as);
xbt_node_t node = NULL;
unsigned int cursor2;
xbt_dynar_t nodes = NULL;
xbt_node_t node = NULL;
unsigned int cursor2;
xbt_dynar_t nodes = NULL;
@@
-74,6
+75,9
@@
void model_dijkstra_both_end(AS_t as)
/* Utility functions */
/* Utility functions */
+namespace simgrid {
+namespace surf {
+
xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id)
{
xbt_node_t node = NULL;
xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id)
{
xbt_node_t node = NULL;
@@
-528,3
+532,6
@@
void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
}
xbt_dynar_free(&route->link_list);
}
}
xbt_dynar_free(&route->link_list);
}
+
+}
+}