added circle placement for ns3 wifi nodes

[simgrid.git] / include / xbt / functional.hpp

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index b16e9471feec1a0a31d608c906a1d76e8af7490c..cc053a56a2d747ce5b6cd56cdc7232549a8f90e9 100644 (file)
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -12,6 +12,7 @@
 #include <cstdlib>
 #include <cstring>
 
+#include <algorithm>
 #include <array>
 #include <exception>
 #include <functional>
@@ -38,15 +39,9 @@ public:
   {
     const int argc                = args_->size();
     std::vector<std::string> args = *args_;
-    if (not args.empty()) {
-      char noarg[] = {'\0'};
-      auto argv    = std::make_unique<char*[]>(argc + 1);
-      for (int i = 0; i != argc; ++i)
-        argv[i] = args[i].empty() ? noarg : &args[i].front();
-      argv[argc] = nullptr;
-      code_(argc, argv.get());
-    } else
-      code_(argc, nullptr);
+    std::vector<char*> argv(args.size() + 1); // argv[argc] is nullptr
+    std::transform(begin(args), end(args), begin(argv), [](std::string& s) { return &s.front(); });
+    code_(argc, argv.data());
   }
 };
 
@@ -145,7 +140,7 @@ class Task<R(Args...)> {
   }
 
 public:
-  Task() { /* Nothing to do */}
+  Task() = default;
   explicit Task(std::nullptr_t) { /* Nothing to do */}
   ~Task()
   {