X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e2e32849ed01a869c9c70e78014e6938f098be5..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/src/surf/xml/platf.hpp

diff --git a/src/surf/xml/platf.hpp b/src/surf/xml/platf.hpp
index 51b7cc3072..070894d3aa 100644
--- a/src/surf/xml/platf.hpp
+++ b/src/surf/xml/platf.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -6,29 +6,30 @@
 #ifndef SURF_SURFXML_PARSE_HPP
 #define SURF_SURFXML_PARSE_HPP
 
+#include <xbt/base.h>
 #include <xbt/signal.hpp>
-
-extern "C" {
+#include <vector>
 
 /* Module management functions */
-XBT_PUBLIC(void) sg_platf_init();;
-XBT_PUBLIC(void) sg_platf_exit();
-
-XBT_PUBLIC(void) surf_parse_open(const char *file);
-XBT_PUBLIC(void) surf_parse_close();
-XBT_PUBLIC(void) surf_parse_assert(bool cond, std::string msg);
-XBT_ATTRIB_NORETURN XBT_PUBLIC(void) surf_parse_error(std::string msg);
-XBT_PUBLIC(void) surf_parse_assert_netpoint(std::string hostname, std::string pre, std::string post);
-XBT_PUBLIC(void) surf_parse_warn(std::string msg);
-
-XBT_PUBLIC(double) surf_parse_get_double(std::string s);
-XBT_PUBLIC(int) surf_parse_get_int(std::string s);
-XBT_PUBLIC(double) surf_parse_get_time(const char* string, const char* entity_kind, std::string name);
-XBT_PUBLIC(double) surf_parse_get_size(const char* string, const char* entity_kind, std::string name);
-XBT_PUBLIC(double) surf_parse_get_bandwidth(const char* string, const char* entity_kind, std::string name);
-XBT_PUBLIC(double) surf_parse_get_speed(const char* string, const char* entity_kind, std::string name);
-
-XBT_PUBLIC(int) surf_parse(); /* Entry-point to the parser */
-}
+XBT_PUBLIC void sg_platf_init();
+XBT_PUBLIC void sg_platf_exit();
+
+XBT_PUBLIC void surf_parse_open(const std::string& file);
+XBT_PUBLIC void surf_parse_close();
+XBT_PUBLIC void surf_parse_assert(bool cond, const std::string& msg);
+XBT_ATTRIB_NORETURN XBT_PUBLIC void surf_parse_error(const std::string& msg);
+XBT_PUBLIC void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre,
+                                           const std::string& post);
+
+XBT_PUBLIC double surf_parse_get_double(const std::string& s);
+XBT_PUBLIC int surf_parse_get_int(const std::string& s);
+XBT_PUBLIC double surf_parse_get_time(const char* string, const char* entity_kind, const std::string& name);
+XBT_PUBLIC double surf_parse_get_size(const char* string, const char* entity_kind, const std::string& name);
+XBT_PUBLIC double surf_parse_get_bandwidth(const char* string, const char* entity_kind, const std::string& name);
+XBT_PUBLIC std::vector<double> surf_parse_get_bandwidths(const char* string, const char* entity_kind,
+                                                         const std::string& name);
+XBT_PUBLIC double surf_parse_get_speed(const char* string, const char* entity_kind, const std::string& name);
+
+XBT_PUBLIC void surf_parse(); /* Entry-point to the parser */
 
 #endif