From 944e89a912796773ddff48f4fc58628f59991ede Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 28 Mar 2018 17:26:05 +0200 Subject: [PATCH] Revert "Please mingw." This reverts commit f364225c23f541330fdc9a512d551a683cf374c9. It was supposed to fix warnings, but now gives errors: C:/projects/simgrid/include/simgrid/s4u/Mailbox.hpp:116:26: error: function 'void simgrid::s4u::intrusive_ptr_add_ref(simgrid::s4u::Mailbox*)' definition is marked dllimport friend XBT_PUBLIC void intrusive_ptr_add_ref(Mailbox*) {} ^ C:/projects/simgrid/include/simgrid/s4u/Mailbox.hpp:116:26: warning: 'void simgrid::s4u::intrusive_ptr_add_ref(simgrid::s4u::Mailbox*)' redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] C:/projects/simgrid/include/simgrid/s4u/Mailbox.hpp:116:26: error: function 'void simgrid::s4u::intrusive_ptr_add_ref(simgrid::s4u::Mailbox*)' definition is marked dllimport --- include/simgrid/s4u/Mailbox.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp index 035a928d05..642ce4a386 100644 --- a/include/simgrid/s4u/Mailbox.hpp +++ b/include/simgrid/s4u/Mailbox.hpp @@ -113,9 +113,9 @@ class XBT_PUBLIC Mailbox { explicit Mailbox(kernel::activity::MailboxImpl * mbox) : pimpl_(mbox) {} /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */ - friend XBT_PUBLIC void intrusive_ptr_add_ref(Mailbox*) {} + friend void intrusive_ptr_add_ref(Mailbox*) {} /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */ - friend XBT_PUBLIC void intrusive_ptr_release(Mailbox*) {} + friend void intrusive_ptr_release(Mailbox*) {} public: /** private function, do not use. FIXME: make me protected */ kernel::activity::MailboxImpl* getImpl() { return pimpl_; } -- 2.20.1