X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b7e401a2d400a77cae7741a12dea84fb6408bbd..71c7635f30fb0ac9067f8d1e5cdab4fe992d6291:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index afce32e8ff..fc90b62a9a 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -1,10 +1,10 @@
-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2017. 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. */
 
-#ifndef _SURF_SURF_PRIVATE_H
-#define _SURF_SURF_PRIVATE_H
+#ifndef SURF_SURF_PRIVATE_H
+#define SURF_SURF_PRIVATE_H
 
 #include "surf/surf.h"
 #include "surf/maxmin.h"
@@ -14,8 +14,6 @@
 
 SG_BEGIN_DECL()
 
-XBT_PUBLIC_DATA(xbt_dict_t) watched_hosts_lib;
-
 extern XBT_PRIVATE const char *surf_action_state_names[6];
 
 /** @ingroup SURF_interface
@@ -33,6 +31,7 @@ typedef enum {
 /* Generic functions common to all models */
 
 XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
+XBT_PRIVATE std::ifstream* surf_ifsopen(std::string name);
 
 /* The __surf_is_absolute_file_path() returns 1 if
  * file_path is a absolute file path, in the other
@@ -45,7 +44,7 @@ extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
 
 XBT_PUBLIC(void) storage_register_callbacks();
 
-XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, NetZone_t rc);
+XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t rc);
 XBT_PRIVATE void parse_after_config();
 
 /********** Tracing **********/
@@ -55,4 +54,4 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
 
 SG_END_DECL()
 
-#endif                          /* _SURF_SURF_PRIVATE_H */
+#endif