Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index cef3ab7efd3d0695ec494bdaf354adfd0bf6221b..5672742cb91b9dc51b7596f026aaa675799babd1 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -696,7 +696,9 @@ XBT_PUBLIC(void) surf_exit(void);
 
 /* Prototypes of the functions that handle the properties */
 XBT_PUBLIC_DATA(xbt_dict_t) current_property_set;       /* the prop set for the currently parsed element (also used in SIMIX) */
-XBT_PUBLIC_DATA(void) parse_properties(void);
+XBT_PUBLIC_DATA(void) parse_properties(const char* prop_id, const char* prop_value);
+XBT_PUBLIC_DATA(void) parse_properties_XML(void);
+XBT_PUBLIC_DATA(void) parse_properties_lua(const char* prop_id, const char* prop_value);
 
 /* surf parse file related (public because called from a test suite) */
 XBT_PUBLIC(void) parse_platform_file(const char *file);