X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..bd76919be169a04d524d59aaad0698411793a410:/src/surf/surf_private.hpp

diff --git a/src/surf/surf_private.hpp b/src/surf/surf_private.hpp
index 3278c2f601..55a7e4f17e 100644
--- a/src/surf/surf_private.hpp
+++ b/src/surf/surf_private.hpp
@@ -6,52 +6,49 @@
 #ifndef SURF_SURF_PRIVATE_HPP
 #define SURF_SURF_PRIVATE_HPP
 
-#include "surf/surf.h"
-#include "surf/maxmin.hpp"
 #include "src/surf/trace_mgr.hpp"
+#include "surf/maxmin.hpp"
+#include "surf/surf.hpp"
 
 #define NO_MAX_DURATION -1.0
 
-SG_BEGIN_DECL()
+extern "C" {
 
-extern XBT_PRIVATE const char *surf_action_state_names[6];
+extern XBT_PRIVATE const char* surf_action_state_names[6];
 
 /** @ingroup SURF_interface
  * @brief Possible update mechanisms
  */
-typedef enum {
-  UM_FULL,      /**< Full update mechanism: the remaining time of every action is recomputed at each step */
-  UM_LAZY,      /**< Lazy update mechanism: only the modified actions get recomputed.
-                     It may be slower than full if your system is tightly coupled to the point where every action
-                     gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for
-                     a simple full update.  */
-  UM_UNDEFINED  /**< Mechanism not defined */
-} e_UM_t;
+enum e_UM_t {
+  UM_FULL,     /**< Full update mechanism: the remaining time of every action is recomputed at each step */
+  UM_LAZY,     /**< Lazy update mechanism: only the modified actions get recomputed.
+                    It may be slower than full if your system is tightly coupled to the point where every action
+                    gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for
+                    a simple full update.  */
+  UM_UNDEFINED /**< Mechanism not defined */
+};
 
 /* Generic functions common to all models */
 
-XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
+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
  * case the function returns 0.
  */
-XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path);
-
-extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
+XBT_PRIVATE int __surf_is_absolute_file_path(const char* file_path);
 
+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, sg_netzone_t rc);
 XBT_PRIVATE void parse_after_config();
 
 /********** Tracing **********/
 /* from surf_instr.c */
-void TRACE_surf_host_set_speed(double date, const char *resource, double power);
-void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth);
-
-SG_END_DECL()
+void TRACE_surf_host_set_speed(double date, const char* resource, double power);
+void TRACE_surf_link_set_bandwidth(double date, const char* resource, double bandwidth);
+}
 
 #endif