move more xml cruft to the xml jail

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 2cf7e4c..1e189ef 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -68,17 +68,8 @@ XBT_PUBLIC(void) routing_register_callbacks(void);
 XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route); // FIXME: make previous function private to routing again?
 
 XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc);
-/**
- * Resource protected methods
- */
-XBT_PRIVATE void surfxml_bufferstack_push(int _new);
-XBT_PRIVATE void surfxml_bufferstack_pop(int _new);
 XBT_PRIVATE void parse_after_config(void);
 
-XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
-
-XBT_PRIVATE void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect);
-
 /********** Tracing **********/
 /* from surf_instr.c */
 void TRACE_surf_host_set_speed(double date, const char *resource, double power);

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index b505dc9..f608ee0 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -288,6 +288,7 @@ XBT_PUBLIC(void) sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage
 XBT_PUBLIC(void) sg_platf_new_mount(sg_platf_mount_cbarg_t mount);
 
 XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process);
+XBT_PRIVATE void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect);
 
 /* Prototypes of the functions offered by flex */
 XBT_PUBLIC(int) surf_parse_lex(void);
@@ -303,6 +304,10 @@ XBT_PUBLIC(int) surf_parse_get_debug(void);
 XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
 XBT_PUBLIC(int) surf_parse_lex_destroy(void);
 
+/* 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;
 
 SG_END_DECL()