From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 8 Dec 2017 21:07:19 +0000 (+0100)
Subject: Fix remaining warnings with mingw.
X-Git-Tag: v3.18~46
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/824d7f2d443d4ba57b4bf93b8977b4f9a76f7cbd

Fix remaining warnings with mingw.

warning: xxx redeclared without dllimport attribute: previous dllimport ignored [-Wattributes]
---

diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp
index 6943de3534..99476f440e 100644
--- a/include/simgrid/s4u/Comm.hpp
+++ b/include/simgrid/s4u/Comm.hpp
@@ -25,8 +25,8 @@ XBT_PUBLIC_CLASS Comm : public Activity
 {
   Comm() : Activity() {}
 public:
-  friend void intrusive_ptr_release(simgrid::s4u::Comm * c);
-  friend void intrusive_ptr_add_ref(simgrid::s4u::Comm * c);
+  friend XBT_PUBLIC(void) intrusive_ptr_release(simgrid::s4u::Comm* c);
+  friend XBT_PUBLIC(void) intrusive_ptr_add_ref(simgrid::s4u::Comm* c);
   friend Mailbox; // Factory of comms
 
   virtual ~Comm();
diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index b140bdbc61..ada9cb9848 100644
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -19,8 +19,8 @@ XBT_PUBLIC_CLASS Exec : public Activity
 {
   Exec() : Activity() {}
 public:
-  friend void intrusive_ptr_release(simgrid::s4u::Exec * e);
-  friend void intrusive_ptr_add_ref(simgrid::s4u::Exec * e);
+  friend XBT_PUBLIC(void) intrusive_ptr_release(simgrid::s4u::Exec* e);
+  friend XBT_PUBLIC(void) intrusive_ptr_add_ref(simgrid::s4u::Exec* e);
   friend ExecPtr this_actor::exec_init(double flops_amount);
 
   ~Exec() = default;
diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index b0a6be6d75..8bbb7ecad9 100644
--- a/src/simix/smx_private.hpp
+++ b/src/simix/smx_private.hpp
@@ -20,7 +20,7 @@ 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;