gosh, so much cruft in this code

[simgrid.git] / include / simgrid / host.h

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index 3879b92..e1d6c26 100644 (file)
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -14,20 +14,18 @@
 
 #include <simgrid/forward.h>
 
-#ifdef __cplusplus
-#include <simgrid/s4u/host.hpp>
-#endif
-
 SG_BEGIN_DECL()
 
+XBT_PUBLIC(void) sg_host_exit();
+
 XBT_PUBLIC(size_t) sg_host_count();
-XBT_PUBLIC(sg_host_t *) sg_host_list(void);
+XBT_PUBLIC(sg_host_t *) sg_host_list();
 
 XBT_PUBLIC(size_t) sg_host_extension_create(void(*deleter)(void*));
 XBT_PUBLIC(void*) sg_host_extension_get(sg_host_t host, size_t rank);
 XBT_PUBLIC(sg_host_t) sg_host_by_name(const char *name);
 XBT_PUBLIC(const char*) sg_host_get_name(sg_host_t host);
-XBT_PUBLIC(xbt_dynar_t) sg_hosts_as_dynar(void);
+XBT_PUBLIC(xbt_dynar_t) sg_hosts_as_dynar();
 
 // ========== User Data ==============
 XBT_PUBLIC(void*) sg_host_user(sg_host_t host);
@@ -40,10 +38,7 @@ msg_host_priv_t sg_host_msg(sg_host_t host);
 XBT_PUBLIC(void) sg_host_msg_set(sg_host_t host, msg_host_priv_t priv);
 
 // ========== Simix layer =============
-typedef struct s_smx_host_priv *smx_host_priv_t;
 XBT_PUBLIC(smx_host_priv_t) sg_host_simix(sg_host_t host);
-XBT_PUBLIC(void) sg_host_simix_set(sg_host_t host, smx_host_priv_t priv);
-XBT_PUBLIC(void) sg_host_simix_destroy(sg_host_t host);
 
 // ========= storage related functions ============
 XBT_PUBLIC(xbt_dict_t) sg_host_get_mounted_storage_list(sg_host_t host);