From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 20 Oct 2015 06:35:22 +0000 (+0200)
Subject: [S4U] declare the classes as public for Windows
X-Git-Tag: v3_13~1645
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1a697cc4a3e16062754e16e0e4662510131ed35a

[S4U] declare the classes as public for Windows
---

diff --git a/include/simgrid/s4u/actor.hpp b/include/simgrid/s4u/actor.hpp
index b8463e643f..d59ad63348 100644
--- a/include/simgrid/s4u/actor.hpp
+++ b/include/simgrid/s4u/actor.hpp
@@ -6,7 +6,8 @@
 #ifndef SIMGRID_S4U_ACTOR_HPP
 #define SIMGRID_S4U_ACTOR_HPP
 
-#include "simgrid/simix.h"
+#include <xbt/base.h>
+#include <simgrid/simix.h>
 
 namespace simgrid {
 namespace s4u {
@@ -39,7 +40,7 @@ class Mailbox;
  * \endverbatim
  *
  */
-class Actor {
+XBT_PUBLIC_CLASS Actor {
 	friend Comm;
 	Actor(smx_process_t smx_proc);
 public:
diff --git a/include/simgrid/s4u/async.hpp b/include/simgrid/s4u/async.hpp
index 838d80012c..3454a03a5d 100644
--- a/include/simgrid/s4u/async.hpp
+++ b/include/simgrid/s4u/async.hpp
@@ -8,6 +8,7 @@
 #define SIMGRID_S4U_ASYNC_HPP
 
 #include <stdlib.h>
+#include <xbt/base.h>
 #include <xbt/misc.h>
 
 SG_BEGIN_DECL();
@@ -27,7 +28,7 @@ class Comm;
  *
  * This class is the ancestor of every asynchronous actions, that is, of actions that do take time in the simulated world.
  */
-class Async {
+XBT_PUBLIC_CLASS Async {
 	friend Comm;
 protected:
 	Async();
diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index 94b74cb326..f006baf849 100644
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -7,8 +7,9 @@
 #ifndef SIMGRID_S4U_COMM_HPP
 #define SIMGRID_S4U_COMM_HPP
 
-#include "simgrid/s4u/async.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include <xbt/base.h>
+#include <simgrid/s4u/async.hpp>
+#include <simgrid/s4u/mailbox.hpp>
 
 namespace simgrid {
 namespace s4u {
@@ -19,7 +20,7 @@ class Mailbox;
  *
  * Represents all asynchronous communications, that you can test or wait onto.
  */
-class Comm : public Async {
+XBT_PUBLIC_CLASS Comm : public Async {
 	Comm() : Async() {}
 public:
 	virtual ~Comm();
diff --git a/include/simgrid/s4u/engine.hpp b/include/simgrid/s4u/engine.hpp
index 96ef4dcd40..0f7dca1fc0 100644
--- a/include/simgrid/s4u/engine.hpp
+++ b/include/simgrid/s4u/engine.hpp
@@ -6,13 +6,15 @@
 #ifndef SIMGRID_S4U_ENGINE_HPP
 #define SIMGRID_S4U_ENGINE_HPP
 
+#include <xbt/base.h>
+
 namespace simgrid {
 namespace s4u {
 /** @brief Simulation engine
  *
  * This class is an interface to the simulation engine.
  */
-class Engine {
+XBT_PUBLIC_CLASS Engine {
 public:
 	/** Constructor, taking the command line parameters of your main function */
 	Engine(int *argc, char **argv);
diff --git a/include/simgrid/s4u/file.hpp b/include/simgrid/s4u/file.hpp
index 28512e76b2..6c4ccd0ce7 100644
--- a/include/simgrid/s4u/file.hpp
+++ b/include/simgrid/s4u/file.hpp
@@ -9,7 +9,8 @@
 #include <boost/unordered_map.hpp>
 #include <vector>
 
-#include "simgrid/simix.h"
+#include <xbt/base.h>
+#include <simgrid/simix.h>
 
 namespace simgrid {
 namespace s4u {
@@ -24,7 +25,7 @@ class Storage;
  * They are located on @link{simgrid::s4u::Storage}, that are accessed from a given @link{simgrid::s4u::Host} through mountpoints.
  * For now, you cannot change the mountpoints programatically, and must declare them from your platform file.
  */
-class File {
+XBT_PUBLIC_CLASS File {
 public:
 	File(const char *fullpath, void* userdata);
 	~File();
diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp
index 74b826bb2b..8eab63d441 100644
--- a/include/simgrid/s4u/host.hpp
+++ b/include/simgrid/s4u/host.hpp
@@ -9,6 +9,7 @@
 #include <boost/unordered_map.hpp>
 #include <vector>
 
+#include "xbt/base.h"
 #include "simgrid/simix.h"
 
 namespace simgrid {
@@ -29,7 +30,7 @@ class File;
  * You can retrieve a particular host using @link{simgrid::s4u::Host.byName()},
  * and actors can retrieve the host on which they run using @link{simgrid::s4u::Host.current()}.
  */
-class Host {
+XBT_PUBLIC_CLASS Host {
 	friend Actor;
 	friend File;
 private:
diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index 77390cf0e1..93dad67e96 100644
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -8,7 +8,8 @@
 
 #include <boost/unordered_map.hpp>
 
-#include "actor.hpp"
+#include <xbt/base.h>
+#include <simgrid/s4u/actor.hpp>
 
 namespace simgrid {
 namespace s4u {
@@ -22,7 +23,7 @@ class Comm;
  * You can access any mailbox without any latency. The network delay are only related to the location of the
  * sender and receiver.
  */
-class Mailbox {
+XBT_PUBLIC_CLASS Mailbox {
 	friend Comm;
 
 private:
diff --git a/include/simgrid/s4u/storage.hpp b/include/simgrid/s4u/storage.hpp
index 3447b723a0..b0b3335372 100644
--- a/include/simgrid/s4u/storage.hpp
+++ b/include/simgrid/s4u/storage.hpp
@@ -8,12 +8,13 @@
 #define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
 
 #include <boost/unordered_map.hpp>
+#include "xbt/base.h"
 #include "simgrid/simix.h"
 
 namespace simgrid {
 namespace s4u {
 
-class Storage {
+XBT_PUBLIC_CLASS Storage {
 private:
 	Storage(std::string name, smx_storage_t inferior);
 	virtual ~Storage();