From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 30 Mar 2018 22:15:57 +0000 (+0200)
Subject: Merge branch 'master' of github.com:simgrid/simgrid
X-Git-Tag: v3.20~572
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/95199f4ffa751d3614a07fefe6b3caa6deca1b97?hp=--cc

Merge branch 'master' of github.com:simgrid/simgrid
---

95199f4ffa751d3614a07fefe6b3caa6deca1b97
diff --cc include/xbt/config.hpp
index a274225de1,1ce01c3b2b..236d87f962
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@@ -167,11 -169,13 +169,13 @@@ typename std::enable_if<std::is_same
  bindFlag(T& value, const char* name, const char* description,
    F callback)
  {
-   declareFlag(name, description, value, [&value, callback](const T& val) {
-     if (not callback(val))
-       throw std::range_error("invalid value.");
-     value = std::move(val);
-   });
+   declareFlag(name, description, value,
+     std::function<void(const T&)>([&value, callback](const T& val) {
+       if (not callback(val))
 -        throw std::range_error("invalid value");
++        throw std::range_error("invalid value.");
+         value = std::move(val);
+     })
+   );
  }
  
  /** A variable bound to a CLI option