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 'master' of github.com:simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
xml
/
platf_private.hpp
diff --git
a/src/surf/xml/platf_private.hpp
b/src/surf/xml/platf_private.hpp
index
ec62ccc
..
931f78a
100644
(file)
--- a/
src/surf/xml/platf_private.hpp
+++ b/
src/surf/xml/platf_private.hpp
@@
-132,7
+132,6
@@
typedef struct s_sg_platf_storage_cbarg {
const char* id;
const char* type_id;
const char* content;
const char* id;
const char* type_id;
const char* content;
- const char* content_type;
xbt_dict_t properties;
const char* attach;
} s_sg_platf_storage_cbarg_t;
xbt_dict_t properties;
const char* attach;
} s_sg_platf_storage_cbarg_t;
@@
-142,7
+141,6
@@
typedef struct s_sg_platf_storage_type_cbarg {
const char* id;
const char* model;
const char* content;
const char* id;
const char* model;
const char* content;
- const char* content_type;
xbt_dict_t properties;
std::map<std::string, std::string>* model_properties;
sg_size_t size;
xbt_dict_t properties;
std::map<std::string, std::string>* model_properties;
sg_size_t size;
@@
-240,17
+238,9
@@
XBT_PUBLIC(int) surf_parse_get_debug();
XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
XBT_PUBLIC(int) surf_parse_lex_destroy();
XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
XBT_PUBLIC(int) surf_parse_lex_destroy();
-/* To include files (?) */
-XBT_PRIVATE void surfxml_bufferstack_push(int _new);
-XBT_PRIVATE void surfxml_bufferstack_pop(int _new);
-XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
-
XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
/********** Instr. **********/
XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
/********** Instr. **********/
-XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);
XBT_PRIVATE void sg_instr_new_router(const char* name);
XBT_PRIVATE void sg_instr_new_router(const char* name);
-XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host);
-XBT_PRIVATE void sg_instr_AS_end();
SG_END_DECL()
SG_END_DECL()