X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc4ca208c5e056ac569cd07e08f09a416f3606fe..a957c8903c9dd13041a0902b130f0e6543388ca2:/src/simix/smx_host_private.hpp

diff --git a/src/simix/smx_host_private.hpp b/src/simix/smx_host_private.hpp
index 899fab36fd..1fd17966db 100644
--- a/src/simix/smx_host_private.hpp
+++ b/src/simix/smx_host_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
@@ -8,17 +8,12 @@
 
 #include <boost/intrusive/list.hpp>
 #include <functional>
-#include <map>
+#include <unordered_map>
 #include <vector>
 
-#include <xbt/Extendable.hpp>
-#include <xbt/base.h>
-
-#include "popping_private.hpp"
-#include "simgrid/simix.h"
-
-#include "ActorImpl.hpp"
-#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/popping_private.hpp"
+#include "xbt/Extendable.hpp"
 
 /** @brief Host datatype from SIMIX POV */
 namespace simgrid {
@@ -31,28 +26,28 @@ public:
   explicit Host();
   virtual ~Host();
 
-  boost::intrusive::list<ActorImpl, boost::intrusive::member_hook<ActorImpl, boost::intrusive::list_member_hook<>,
-                                                                  &ActorImpl::host_process_list_hook>>
+  boost::intrusive::list<kernel::actor::ActorImpl,
+                         boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
+                                                       &kernel::actor::ActorImpl::host_process_list_hook>>
       process_list;
-  std::vector<ProcessArg*> auto_restart_processes;
-  std::vector<ProcessArg*> boot_processes;
+  std::vector<kernel::actor::ProcessArg*> auto_restart_processes;
+  std::vector<kernel::actor::ProcessArg*> boot_processes;
 
   void turnOn();
 };
 }
 }
 
-extern "C" {
 XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std::function<void()> code,
                                                      void* data, double kill_time,
-                                                     std::map<std::string, std::string>* properties, int auto_restart);
+                                                     std::unordered_map<std::string, std::string>* properties,
+                                                     int auto_restart);
 
 XBT_PRIVATE void SIMIX_host_autorestart(sg_host_t host);
 
 XBT_PRIVATE void SIMIX_execution_finish(smx_activity_t synchro);
 
 XBT_PRIVATE void SIMIX_set_category(smx_activity_t synchro, const char* category);
-}
 
 XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 SIMIX_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host);