From 89787faa7988da022b75545df04905f581f449d8 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 17 Feb 2017 22:23:39 +0100 Subject: [PATCH] mark s4u::Link as public for windows (+cosmetics) --- include/simgrid/s4u/Link.hpp | 9 ++++----- include/simgrid/s4u/conditionVariable.hpp | 2 -- include/simgrid/s4u/forward.hpp | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp index 605c92e830..3fbf185dd2 100644 --- a/include/simgrid/s4u/Link.hpp +++ b/include/simgrid/s4u/Link.hpp @@ -6,14 +6,12 @@ #ifndef S4U_LINK_HPP_ #define S4U_LINK_HPP_ +#include #include +#include #include -#include "xbt/signal.hpp" - -#include "simgrid/link.h" - /*********** * Classes * ***********/ @@ -24,7 +22,8 @@ class NetworkAction; }; namespace s4u { /** @brief A Link represents the network facilities between [hosts](\ref simgrid::s4u::Host) */ -class Link { +XBT_PUBLIC_CLASS Link +{ friend simgrid::surf::LinkImpl; private: diff --git a/include/simgrid/s4u/conditionVariable.hpp b/include/simgrid/s4u/conditionVariable.hpp index 973b982469..d3e777e6ae 100644 --- a/include/simgrid/s4u/conditionVariable.hpp +++ b/include/simgrid/s4u/conditionVariable.hpp @@ -23,8 +23,6 @@ namespace simgrid { namespace s4u { -class Mutex; - /** @brief A condition variable * @ingroup s4u_api * diff --git a/include/simgrid/s4u/forward.hpp b/include/simgrid/s4u/forward.hpp index 53278828f4..8b520b1672 100644 --- a/include/simgrid/s4u/forward.hpp +++ b/include/simgrid/s4u/forward.hpp @@ -21,6 +21,7 @@ class Host; class Link; class Mailbox; using MailboxPtr = boost::intrusive_ptr; +class Mutex; class Storage; -- 2.20.1