Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI

[simgrid.git] / include / simgrid / s4u / actor.hpp

diff --git a/include/simgrid/s4u/actor.hpp b/include/simgrid/s4u/actor.hpp
index b342262..d59ad63 100644 (file)
--- 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:
@@ -48,7 +49,7 @@ public:
        virtual ~Actor() {}
 
        /** The main method of your agent */
-       int main(int argc, char **argv) {return 0;}
+       virtual int main(int argc, char **argv);
 
        /** The Actor that is currently running */
        static Actor *current();