windows: also allow internal includes to the lib

[simgrid.git] / src / simix / smx_private.hpp

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index 55664e2..1dc37d7 100644 (file)
--- a/src/simix/smx_private.hpp
+++ b/src/simix/smx_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. */
@@ -10,6 +10,7 @@
 #include "src/kernel/context/Context.hpp"
 #include <csignal>
 
+#include <boost/intrusive/list.hpp>
 #include <map>
 #include <vector>
 
@@ -19,14 +20,16 @@ namespace simgrid {
 namespace simix {
 
 class Global {
-  friend bool simgrid::s4u::this_actor::isMaestro();
+  friend XBT_PUBLIC bool simgrid::s4u::this_actor::isMaestro();
 
 public:
   smx_context_factory_t context_factory = nullptr;
   std::vector<smx_actor_t> process_to_run;
   std::vector<smx_actor_t> process_that_ran;
   std::map<aid_t, smx_actor_t> process_list;
-  xbt_swag_t process_to_destroy = nullptr;
+  boost::intrusive::list<ActorImpl, boost::intrusive::member_hook<ActorImpl, boost::intrusive::list_member_hook<>,
+                                                                  &ActorImpl::smx_destroy_list_hook>>
+      process_to_destroy;
 #if SIMGRID_HAVE_MC
   /* MCer cannot read members process_list and process_to_destroy above in the remote process, so we copy the info it
    * needs in a dynar.
@@ -63,9 +66,9 @@ public:
 
 extern "C" {
 
-XBT_PUBLIC_DATA(std::unique_ptr<simgrid::simix::Global>) simix_global;
+XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
 
-XBT_PUBLIC(void) SIMIX_clean();
+XBT_PUBLIC void SIMIX_clean();
 
 /******************************** Exceptions *********************************/
 /** @brief Ask to the provided ActorImpl to raise the provided exception */