Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Revert "Please mingw."
authorArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Wed, 28 Mar 2018 15:26:05 +0000 (17:26 +0200)
committerArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Wed, 28 Mar 2018 15:26:05 +0000 (17:26 +0200)
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

index 035a928..642ce4a 100644 (file)
@@ -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_; }