Please cppcheck (codacy).

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

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index ca034ba..8b73dab 100644 (file)
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2015-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -39,14 +38,17 @@ public:
   {}
   void operator()() const
   {
-    char noarg[] = {'\0'};
     const int argc = args_->size();
     std::vector<std::string> args = *args_;
-    std::unique_ptr<char*[]> argv(new 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());
+    if (not args.empty()) {
+      char noarg[] = {'\0'};
+      std::unique_ptr<char* []> argv(new 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);
   }
 };
 
@@ -128,8 +130,8 @@ private:
     std::pair<void(whatever::*)(), whatever*> memberptr;
     char any1[sizeof(std::pair<void(*)(),void*>)];
     char any2[sizeof(std::pair<void(whatever::*)(), whatever*>)];
-    TaskUnion() {}
-    ~TaskUnion() {}
+    TaskUnion() { /* Nothing to do */}
+    ~TaskUnion() { /* Nothing to do */}
   };
 #endif
 
@@ -168,9 +170,8 @@ private:
   }
 
 public:
-
-  Task() {}
-  Task(std::nullptr_t) {}
+  Task() { /* Nothing to do */}
+  explicit Task(std::nullptr_t) { /* Nothing to do */}
   ~Task()
   {
     this->clear();
@@ -183,7 +184,8 @@ public:
     if (that.vtable_ && that.vtable_->move)
       that.vtable_->move(buffer_, that.buffer_);
     else
-      std::memcpy(&buffer_, &that.buffer_, sizeof(buffer_));
+      std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
+
     vtable_ = that.vtable_;
     that.vtable_ = nullptr;
   }
@@ -193,7 +195,7 @@ public:
     if (that.vtable_ && that.vtable_->move)
       that.vtable_->move(buffer_, that.buffer_);
     else
-      std::memcpy(&buffer_, &that.buffer_, sizeof(buffer_));
+      std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
     vtable_ = that.vtable_;
     that.vtable_ = nullptr;
     return *this;
@@ -207,11 +209,11 @@ private:
   {
     const static TaskVtable vtable {
       // Call:
-      [](TaskUnion& buffer, Args... args) -> R {
+      [](TaskUnion& buffer, Args... args) {
         F* src = reinterpret_cast<F*>(&buffer);
         F code = std::move(*src);
         src->~F();
-        code(std::forward<Args>(args)...);
+        return code(std::forward<Args>(args)...);
       },
       // Destroy:
       std::is_trivially_destructible<F>::value ?
@@ -236,7 +238,7 @@ private:
   {
     const static TaskVtable vtable {
       // Call:
-      [](TaskUnion& buffer, Args... args) -> R {
+      [](TaskUnion& buffer, Args... args) {
         // Delete F when we go out of scope:
         std::unique_ptr<F> code(*reinterpret_cast<F**>(&buffer));
         return (*code)(std::forward<Args>(args)...);
@@ -254,12 +256,7 @@ private:
   }
 
 public:
-
-  template<class F>
-  Task(F code)
-  {
-    this->init(std::move(code));
-  }
+  template <class F> explicit Task(F code) { this->init(std::move(code)); }
 
   operator bool() const { return vtable_ != nullptr; }
   bool operator!() const { return vtable_ == nullptr; }
@@ -296,7 +293,7 @@ auto makeTask(F code, Args... args)
 -> Task< decltype(code(std::move(args)...))() >
 {
   TaskImpl<F, Args...> task(std::move(code), std::make_tuple(std::move(args)...));
-  return std::move(task);
+  return Task<decltype(code(std::move(args)...))()>(std::move(task));
 }
 
 }