From 3fd610a08b4a9916c10ea6282f1bca7c387e5314 Mon Sep 17 00:00:00 2001
From: quemy <alexandre.quemy@gmail.com>
Date: Sun, 9 Dec 2012 22:08:50 +0100
Subject: [PATCH] Clean includes

---
 smp/src/MWModel.h             | 1 -
 smp/src/abstractIsland.h      | 2 +-
 smp/src/bimap.h               | 1 -
 smp/src/contWrapper.h         | 7 ++-----
 smp/src/homogeneousModel.h    | 2 +-
 smp/src/intPolicy.h           | 2 +-
 smp/src/islandModel.h         | 2 +-
 smp/src/islandNotifier.h      | 1 -
 smp/src/migPolicy.h           | 2 +-
 smp/src/notifier.h            | 2 +-
 smp/src/policiesDispatching.h | 2 --
 smp/src/policyElement.h       | 4 +++-
 12 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/smp/src/MWModel.h b/smp/src/MWModel.h
index 4e35bfc9f..cad614851 100644
--- a/smp/src/MWModel.h
+++ b/smp/src/MWModel.h
@@ -37,7 +37,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <algoDispatching.h>
 #include <policiesDispatching.h>
 
-
 #include <eo>
 
 
diff --git a/smp/src/abstractIsland.h b/smp/src/abstractIsland.h
index 1760a7d02..ba8a3f43a 100644
--- a/smp/src/abstractIsland.h
+++ b/smp/src/abstractIsland.h
@@ -32,7 +32,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <atomic>
 
-#include <eo>
+#include <eoPop.h>
 #include <migPolicy.h>
 
 namespace paradiseo
diff --git a/smp/src/bimap.h b/smp/src/bimap.h
index ee7f5cb57..f914cc766 100644
--- a/smp/src/bimap.h
+++ b/smp/src/bimap.h
@@ -30,7 +30,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_BIMAP_MODEL_H_
 #define SMP_BIMAP_MODEL_H_
 
-#include <set>
 #include <map>
 
 namespace paradiseo
diff --git a/smp/src/contWrapper.h b/smp/src/contWrapper.h
index fe3eefa7f..7dfad0f95 100644
--- a/smp/src/contWrapper.h
+++ b/smp/src/contWrapper.h
@@ -30,11 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_CONT_WRAPPER_H_
 #define SMP_CONT_WRAPPER_H_
 
-#include <queue>
-#include <vector>
-#include <utility>
-
-#include <eo>
+#include <utils/eoCheckPoint.h>
+#include <eoContinue.h>
 #include <migPolicy.h>
 #include <islandNotifier.h>
 
diff --git a/smp/src/homogeneousModel.h b/smp/src/homogeneousModel.h
index 214a770a4..af6519828 100644
--- a/smp/src/homogeneousModel.h
+++ b/smp/src/homogeneousModel.h
@@ -33,8 +33,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <queue>
 #include <algorithm>
 #include <utility>
-#include <future>
 #include <thread>
+
 #include <bimap.h>
 #include <abstractIsland.h>
 #include <island.h>
diff --git a/smp/src/intPolicy.h b/smp/src/intPolicy.h
index 5d6529417..c9ea7d292 100644
--- a/smp/src/intPolicy.h
+++ b/smp/src/intPolicy.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_INT_POLICY_H_
 #define SMP_INT_POLICY_H_
 
-#include <eo>
+#include <eoReplacement.h>
 
 namespace paradiseo
 {
diff --git a/smp/src/islandModel.h b/smp/src/islandModel.h
index 08da3dfbf..11e98c3c9 100644
--- a/smp/src/islandModel.h
+++ b/smp/src/islandModel.h
@@ -33,8 +33,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <queue>
 #include <algorithm>
 #include <utility>
-#include <future>
 #include <thread>
+
 #include <bimap.h>
 #include <abstractIsland.h>
 #include <topology/topology.h>
diff --git a/smp/src/islandNotifier.h b/smp/src/islandNotifier.h
index a07be3b17..630d058ec 100644
--- a/smp/src/islandNotifier.h
+++ b/smp/src/islandNotifier.h
@@ -30,7 +30,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_ISLAND_NOTIFIER_H_
 #define SMP_ISLAND_NOTIFIER_H_
 
-#include <vector>
 #include <utility>
 
 /** IslandNotifier: The notifier will perform the binded task each generation.
diff --git a/smp/src/migPolicy.h b/smp/src/migPolicy.h
index aa90c9eaa..6c37ef7de 100644
--- a/smp/src/migPolicy.h
+++ b/smp/src/migPolicy.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_MIG_POLICY_H_
 #define SMP_MIG_POLICY_H_
 
-#include <eo>
+#include <vector>
 #include <policyElement.h>
 
 namespace paradiseo
diff --git a/smp/src/notifier.h b/smp/src/notifier.h
index 84232f4d6..25a001c24 100644
--- a/smp/src/notifier.h
+++ b/smp/src/notifier.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_NOTIFIER_H_
 #define SMP_NOTIFIER_H_
 
-#include <eo>
+#include <utils/eoUpdater.h>
 #include <functional>
 
 /** Notifier: The notifier will perform the binded task each generation.
diff --git a/smp/src/policiesDispatching.h b/smp/src/policiesDispatching.h
index 4bbe2e04a..34accdfe1 100644
--- a/smp/src/policiesDispatching.h
+++ b/smp/src/policiesDispatching.h
@@ -30,8 +30,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_POLICIES_DISPATCHING_H_
 #define SMP_POLICIES_DISPATCHING_H_
 
-#include <eo>
-
 namespace paradiseo
 {
 namespace smp
diff --git a/smp/src/policyElement.h b/smp/src/policyElement.h
index 54f401508..785951fc6 100644
--- a/smp/src/policyElement.h
+++ b/smp/src/policyElement.h
@@ -30,7 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef SMP_POLICY_ELEMENT_H_
 #define SMP_POLICY_ELEMENT_H_
 
-#include <eo>
+#include <eoContinue.h>
+#include <eoSelect.h>
+#include <eoPop.h>
 
 namespace paradiseo
 {