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 'toufic' of github.com:Takishipp/simgrid
[simgrid.git]
/
include
/
surf
/
surf_routing.h
diff --git
a/include/surf/surf_routing.h
b/include/surf/surf_routing.h
index
181cd1f
..
ce7ec7a
100644
(file)
--- a/
include/surf/surf_routing.h
+++ b/
include/surf/surf_routing.h
@@
-4,8
+4,8
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#ifndef
_
SURF_SURF_ROUTING_H
-#define
_
SURF_SURF_ROUTING_H
+#ifndef SURF_SURF_ROUTING_H
+#define SURF_SURF_ROUTING_H
#include "xbt/lib.h"
#include "xbt/lib.h"
@@
-15,15
+15,9
@@
SG_BEGIN_DECL()
XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level
XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level
-XBT_PUBLIC_DATA(xbt_lib_t) as_router_lib;
-XBT_PUBLIC_DATA(int) ROUTING_ASR_LEVEL; //Routing level
-XBT_PUBLIC_DATA(int) ROUTING_PROP_ASR_LEVEL; //Properties for AS and router
-
XBT_PUBLIC_DATA(xbt_lib_t) storage_lib;
XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL; //Routing storage level
XBT_PUBLIC_DATA(xbt_lib_t) storage_lib;
XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL; //Routing storage level
-XBT_PUBLIC_DATA(int) ROUTING_STORAGE_HOST_LEVEL;
XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL; // Surf storage level
XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL; // Surf storage level
-XBT_PUBLIC_DATA(xbt_lib_t) file_lib;
XBT_PUBLIC_DATA(xbt_lib_t) storage_type_lib;
XBT_PUBLIC_DATA(int) ROUTING_STORAGE_TYPE_LEVEL; //Routing storage_type level
XBT_PUBLIC_DATA(xbt_lib_t) storage_type_lib;
XBT_PUBLIC_DATA(int) ROUTING_STORAGE_TYPE_LEVEL; //Routing storage_type level