From aa9c01568b3e3db54697abcb8631d6b064241e81 Mon Sep 17 00:00:00 2001
From: quemy <alexandre.quemy@gmail.com>
Date: Tue, 4 Dec 2012 23:17:27 +0100
Subject: [PATCH] Fix a bug in conversion functions for heterogeneous model

---
 smp/src/island.cpp      | 6 +++---
 smp/src/island.h        | 2 +-
 smp/src/islandModel.cpp | 5 +----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/smp/src/island.cpp b/smp/src/island.cpp
index 6bd865ee4..2d8586d06 100644
--- a/smp/src/island.cpp
+++ b/smp/src/island.cpp
@@ -29,7 +29,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 template<template <class> class EOAlgo, class EOT, class bEOT>
 template<class... Args>
-paradiseo::smp::Island<EOAlgo,EOT,bEOT>::Island(std::function<EOT&&(bEOT&)> _convertFromBase, std::function<bEOT&&(EOT&)> _convertToBase, eoPop<EOT>& _pop, IntPolicy<EOT>& _intPolicy, MigPolicy<EOT>& _migPolicy, Args&... args) :
+paradiseo::smp::Island<EOAlgo,EOT,bEOT>::Island(std::function<EOT(bEOT&)> _convertFromBase, std::function<bEOT(EOT&)> _convertToBase, eoPop<EOT>& _pop, IntPolicy<EOT>& _intPolicy, MigPolicy<EOT>& _migPolicy, Args&... args) :
     // The PPExpander looks for the continuator in the parameters pack.
     // The private inheritance of ContWrapper wraps the continuator and add islandNotifier.
     ContWrapper<EOT, bEOT>(Loop<Args...>().template findValue<eoContinue<EOT>>(args...), this),
@@ -54,8 +54,8 @@ template<class... Args>
 paradiseo::smp::Island<EOAlgo,EOT,bEOT>::Island(eoPop<EOT>& _pop, IntPolicy<EOT>& _intPolicy, MigPolicy<EOT>& _migPolicy, Args&... args) :
     Island(
     // Default conversion functions for homogeneous islands
-    [](bEOT& i) -> EOT&& { return std::forward<EOT>(i); },
-    [](EOT& i) -> bEOT&& { return std::forward<bEOT>(i); },
+    [](bEOT& i) -> EOT { return std::forward<EOT>(i); },
+    [](EOT& i) -> bEOT { return std::forward<bEOT>(i); },
     _pop, _intPolicy, _migPolicy, args...)
 { }
 
diff --git a/smp/src/island.h b/smp/src/island.h
index 947f28089..7f37b312e 100644
--- a/smp/src/island.h
+++ b/smp/src/island.h
@@ -75,7 +75,7 @@ public:
      * @param args Parameters to construct the algorithm.
      */
     template<class... Args>
-    Island(std::function<EOT&&(bEOT&)> _convertFromBase, std::function<bEOT&&(EOT&)> _convertToBase, eoPop<EOT>& pop, IntPolicy<EOT>& _intPolicy, MigPolicy<EOT>& _migPolicy, Args&... args);
+    Island(std::function<EOT(bEOT&)> _convertFromBase, std::function<bEOT(EOT&)> _convertToBase, eoPop<EOT>& pop, IntPolicy<EOT>& _intPolicy, MigPolicy<EOT>& _migPolicy, Args&... args);
     /**
      * Constructor
      * @param _popSize Size of the algorithm population.
diff --git a/smp/src/islandModel.cpp b/smp/src/islandModel.cpp
index 4ed72f4fd..626ed0745 100644
--- a/smp/src/islandModel.cpp
+++ b/smp/src/islandModel.cpp
@@ -94,10 +94,7 @@ void paradiseo::smp::IslandModel<EOT>::operator()()
     for(auto& thread : threads)
         thread.join();
     
-    // Send last population
-    while(!listEmigrants.empty())
-        send();
-    
+   
     // Wait the end of messages sending
     for(auto& message : sentMessages)
         message.join();