another try to solve weird travis issues

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 8545b57..8d8aefd 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -78,6 +78,7 @@ typedef simgrid::kernel::context::Context* smx_context_t;
 typedef simgrid::simix::ActorImpl* smx_actor_t;
 typedef simgrid::simix::MutexImpl* smx_mutex_t;
 typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t;
 typedef simgrid::simix::ActorImpl* smx_actor_t;
 typedef simgrid::simix::MutexImpl* smx_mutex_t;
 typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t;

+typedef simgrid::surf::FileImpl* surf_file_t;

 
 #else
 
 
 #else
 

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 1168847..d50ac13 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -194,6 +194,8 @@ public:
   static ActorPtr createActor(const char* name, s4u::Host* host, const char* function, std::vector<std::string> args);
 
   // ***** Methods *****
   static ActorPtr createActor(const char* name, s4u::Host* host, const char* function, std::vector<std::string> args);
 
   // ***** Methods *****

+  /** This actor will be automatically terminated when the last non-daemon process finishes **/
+  void deamonize();

 
   /** Retrieves the name of that actor as a C string */
   const char* cname();
 
   /** Retrieves the name of that actor as a C string */
   const char* cname();

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 9d22568..f1bb900 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -7,8 +7,8 @@
 #define _SIMIX_SIMIX_H
 
 #include "simgrid/datatypes.h"
 #define _SIMIX_SIMIX_H
 
 #include "simgrid/datatypes.h"

+#include "simgrid/forward.h"

 #include "simgrid/host.h"
 #include "simgrid/host.h"

-#include "src/include/surf/surf.h"

 #include "xbt/ex.h"
 #include "xbt/parmap.h"
 
 #include "xbt/ex.h"
 #include "xbt/parmap.h"