Some #include fixes

diff --git a/include/simgrid/s4u/mutex.hpp b/include/simgrid/s4u/mutex.hpp
index ff60143..bf4e00d 100644 (file)
--- a/include/simgrid/s4u/mutex.hpp
+++ b/include/simgrid/s4u/mutex.hpp
@@ -9,7 +9,6 @@
 #include <mutex>
 #include <utility>
 
 #include <mutex>
 #include <utility>
 

-#include <boost/intrusive_ptr.hpp>

 #include <xbt/base.h>
 #include "simgrid/simix.h"
 
 #include <xbt/base.h>
 #include "simgrid/simix.h"
 

diff --git a/include/xbt/signal.hpp b/include/xbt/signal.hpp
index 08fbff6..508822c 100644 (file)
--- a/include/xbt/signal.hpp
+++ b/include/xbt/signal.hpp
@@ -7,6 +7,7 @@
 #define SIMGRID_XBT_SIGNAL_HPP
 
 #include <functional>
 #define SIMGRID_XBT_SIGNAL_HPP
 
 #include <functional>

+#include <utility>

 #include <vector>
 
 namespace simgrid {
 #include <vector>
 
 namespace simgrid {


@@ -26,12 +27,11 @@ namespace xbt {
     typedef std::function<R(P...)> callback_type;
     std::vector<callback_type> handlers_;
   public:
     typedef std::function<R(P...)> callback_type;
     std::vector<callback_type> handlers_;
   public:

-    template<class U> XBT_ALWAYS_INLINE
+    template<class U>

     void connect(U slot)
     {
       handlers_.push_back(std::move(slot));
     }
     void connect(U slot)
     {
       handlers_.push_back(std::move(slot));
     }

-    XBT_ALWAYS_INLINE

     R operator()(P... args) const
     {
       for (auto& handler : handlers_)
     R operator()(P... args) const
     {
       for (auto& handler : handlers_)

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 7f5e474..4f70915 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -4,6 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

+#include <boost/intrusive/list.hpp>
+

 #include <xbt/base.h>
 
 #include "src/surf/cpu_interface.hpp"
 #include <xbt/base.h>
 
 #include "src/surf/cpu_interface.hpp"

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 9372970..51e5d8b 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -6,6 +6,8 @@
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
 
 #ifndef SURF_MODEL_H_
 #define SURF_MODEL_H_
 

+#include <cstddef>
+

 #include <xbt.h>
 #include <memory>
 #include <utility>
 #include <xbt.h>
 #include <memory>
 #include <utility>

diff --git a/src/surf/virtual_machine.cpp b/src/surf/virtual_machine.cpp
index 43fa47e..4b4a895 100644 (file)
--- a/src/surf/virtual_machine.cpp
+++ b/src/surf/virtual_machine.cpp
@@ -4,6 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

+#include <xbt/signal.hpp>
+

 #include "cpu_cas01.hpp"
 #include "virtual_machine.hpp"
 
 #include "cpu_cas01.hpp"
 #include "virtual_machine.hpp"
 

diff --git a/src/surf/virtual_machine.hpp b/src/surf/virtual_machine.hpp
index b65d291..5b1396d 100644 (file)
--- a/src/surf/virtual_machine.hpp
+++ b/src/surf/virtual_machine.hpp
@@ -4,6 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

+#include <boost/intrusive/list.hpp>
+

 #include <xbt/base.h>
 
 #include "src/surf/HostImpl.hpp"
 #include <xbt/base.h>
 
 #include "src/surf/HostImpl.hpp"