From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Wed, 16 Jan 2019 21:57:19 +0000 (+0100)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid
X-Git-Tag: v3_22~545
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7ddbdc25753a729517ed23899c83eb808acdd50f?hp=-c

Merge branch 'master' of framagit.org:simgrid/simgrid
---

7ddbdc25753a729517ed23899c83eb808acdd50f
diff --combined src/include/xbt/parmap.hpp
index a94e6894c6,fc8f6da80b..4e073a14a7
--- a/src/include/xbt/parmap.hpp
+++ b/src/include/xbt/parmap.hpp
@@@ -10,7 -10,6 +10,6 @@@
  
  #include "src/internal_config.h" // HAVE_FUTEX_H
  #include "src/kernel/context/Context.hpp"
- #include "xbt/xbt_os_thread.h"
  
  #include <boost/optional.hpp>
  #include <condition_variable>
@@@ -163,7 -162,7 +162,7 @@@ template <typename T> Parmap<T>::Parmap
    /* Initialize the thread pool data structure */
    this->status      = PARMAP_WORK;
    this->work_round  = 0;
 -  this->workers.reserve(num_workers);
 +  this->workers.resize(num_workers);
    this->num_workers = num_workers;
    this->synchro     = new_synchro(mode);
  
@@@ -206,6 -205,7 +205,6 @@@ template <typename T> Parmap<T>::~Parma
    for (unsigned i = 1; i < num_workers; i++)
      workers[i]->join();
  
 -  workers.clear();
    delete synchro;
  }