diff --git a/smp/src/abstractIsland.h b/smp/src/abstractIsland.h index 5ffb7927b..00317a485 100644 --- a/smp/src/abstractIsland.h +++ b/smp/src/abstractIsland.h @@ -63,16 +63,7 @@ public: */ virtual void setModel(IslandModel* _model) = 0; - /** - * Send population to mediator - * @param _select Method to select EOT to send - */ - virtual void send(eoSelect& _select) = 0; - - /** - * Check if there is population to receive - */ - virtual void receive(void) = 0; + /** * Check if there is population to receive or to emigrate diff --git a/smp/src/contWrapper.cpp b/smp/src/contWrapper.cpp index 38737bcdc..e8fd35444 100644 --- a/smp/src/contWrapper.cpp +++ b/smp/src/contWrapper.cpp @@ -27,10 +27,10 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -template -paradiseo::smp::ContWrapper::ContWrapper(eoContinue& _cont, AIsland* island) : +template +paradiseo::smp::ContWrapper::ContWrapper(eoContinue& _cont, AIsland* island) : ck(_cont), - islandNotifier(island, &AIsland::check) + islandNotifier(island, &AIsland::check) { ck.add(islandNotifier); } diff --git a/smp/src/contWrapper.h b/smp/src/contWrapper.h index 68511ce4a..9d99495e5 100644 --- a/smp/src/contWrapper.h +++ b/smp/src/contWrapper.h @@ -50,7 +50,7 @@ By using the wrapper, we do not have to modify original continuators inside the it avoids some side effects. */ -template +template class ContWrapper { public: @@ -59,11 +59,11 @@ public: * @param _cont Original continuators * @param _policy Policy to wrap with continuators */ - ContWrapper(eoContinue& _cont, AIsland* island); + ContWrapper(eoContinue& _cont, AIsland* island); protected: eoCheckPoint ck; - IslandNotifier islandNotifier; + IslandNotifier islandNotifier; }; #include diff --git a/smp/src/island.cpp b/smp/src/island.cpp index 7ad27c4fb..889ade6eb 100644 --- a/smp/src/island.cpp +++ b/smp/src/island.cpp @@ -27,12 +27,12 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -template