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
Remove unnecessary casts
[simgrid.git]
/
src
/
surf
/
surf_routing_private.hpp
diff --git
a/src/surf/surf_routing_private.hpp
b/src/surf/surf_routing_private.hpp
index
e3d718b
..
fa365c1
100644
(file)
--- a/
src/surf/surf_routing_private.hpp
+++ b/
src/surf/surf_routing_private.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009
, 2010, 2011
. The SimGrid Team.
+/* Copyright (c) 2009
-2011, 2013-2014
. 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
@@
-10,7
+10,7
@@
#include <float.h>
#include "internal_config.h"
#include <float.h>
#include "internal_config.h"
-#include "surf.hpp"
+#include "surf
_interface
.hpp"
#include "xbt/dynar.h"
#include "xbt/str.h"
#include "xbt/config.h"
#include "xbt/dynar.h"
#include "xbt/str.h"
#include "xbt/config.h"
@@
-65,16
+65,10
@@
void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route);
/* ************************************************** */
/* ************** Cluster ROUTING **************** */
/* ************************************************** */
/* ************** Cluster ROUTING **************** */
-class AsCluster : public As {
-public:
- void *backbone;
- void *loopback;
- RoutingEdgePtr p_router;
-};
-typedef AsCluster *AsClusterPtr;
-//FIXME:remove} s_as_cluster_t, *as_cluster_t;
AsPtr model_cluster_create(void); /* create structures for cluster routing model */
AsPtr model_cluster_create(void); /* create structures for cluster routing model */
+AsPtr model_torus_cluster_create(void); /* create structures for cluster routing model */
+
/* ************************************************** */
/* ************** Vivaldi ROUTING **************** */
/* ************************************************** */
/* ************** Vivaldi ROUTING **************** */