[sonar] Replace redundant type with "auto" (include/ and src/).

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

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index 2cf671a..b16e947 100644 (file)
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -7,7 +7,6 @@
 #define XBT_FUNCTIONAL_HPP
 
 #include <xbt/sysdep.h>
-#include <xbt/utility.hpp>
 
 #include <cstddef>
 #include <cstdlib>
@@ -41,7 +40,7 @@ public:
     std::vector<std::string> args = *args_;
     if (not args.empty()) {
       char noarg[] = {'\0'};
-      std::unique_ptr<char* []> argv(new char*[argc + 1]);
+      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;
@@ -64,8 +63,8 @@ template <class F> inline std::function<void()> wrap_main(F code, int argc, cons
 
 namespace bits {
 template <class F, class Tuple, std::size_t... I>
-constexpr auto apply(F&& f, Tuple&& t, simgrid::xbt::index_sequence<I...>)
-  -> decltype(std::forward<F>(f)(std::get<I>(std::forward<Tuple>(t))...))
+constexpr auto apply(F&& f, Tuple&& t, std::index_sequence<I...>)
+    -> decltype(std::forward<F>(f)(std::get<I>(std::forward<Tuple>(t))...))
 {
   return std::forward<F>(f)(std::get<I>(std::forward<Tuple>(t))...);
 }
@@ -81,20 +80,13 @@ constexpr auto apply(F&& f, Tuple&& t, simgrid::xbt::index_sequence<I...>)
  *  @endcode
  **/
 template <class F, class Tuple>
-constexpr auto apply(F&& f, Tuple&& t)
-  -> decltype(simgrid::xbt::bits::apply(
-    std::forward<F>(f),
-    std::forward<Tuple>(t),
-    simgrid::xbt::make_index_sequence<
-      std::tuple_size<typename std::decay<Tuple>::type>::value
-    >()))
+constexpr auto apply(F&& f, Tuple&& t) -> decltype(
+    simgrid::xbt::bits::apply(std::forward<F>(f), std::forward<Tuple>(t),
+                              std::make_index_sequence<std::tuple_size<typename std::decay<Tuple>::type>::value>()))
 {
   return simgrid::xbt::bits::apply(
-    std::forward<F>(f),
-    std::forward<Tuple>(t),
-    simgrid::xbt::make_index_sequence<
-      std::tuple_size<typename std::decay<Tuple>::type>::value
-    >());
+      std::forward<F>(f), std::forward<Tuple>(t),
+      std::make_index_sequence<std::tuple_size<typename std::decay<Tuple>::type>::value>());
 }
 
 template<class T> class Task;
@@ -162,25 +154,24 @@ public:
 
   Task(Task const&) = delete;
 
-  Task(Task&& that)
+  Task(Task&& that) noexcept
   {
     if (that.vtable_ && that.vtable_->move)
       that.vtable_->move(buffer_, that.buffer_);
     else
       std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
-
-    vtable_ = that.vtable_;
+    vtable_      = std::move(that.vtable_);
     that.vtable_ = nullptr;
   }
   Task& operator=(Task const& that) = delete;
-  Task& operator=(Task&& that)
+  Task& operator=(Task&& that) noexcept
   {
     this->clear();
     if (that.vtable_ && that.vtable_->move)
       that.vtable_->move(buffer_, that.buffer_);
     else
       std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
-    vtable_ = that.vtable_;
+    vtable_      = std::move(that.vtable_);
     that.vtable_ = nullptr;
     return *this;
   }
@@ -192,23 +183,24 @@ private:
   {
     const static TaskVtable vtable {
       // Call:
-      [](TaskUnion& buffer, Args&&... args) {
-        F* src = reinterpret_cast<F*>(&buffer);
+      [](TaskUnion& buffer, Args... args) {
+        auto* src = reinterpret_cast<F*>(&buffer);
         F code = std::move(*src);
         src->~F();
-        return code(std::move(args)...);
+        // NOTE: std::forward<Args>(args)... is correct.
+        return code(std::forward<Args>(args)...);
       },
       // Destroy:
       std::is_trivially_destructible<F>::value ?
       static_cast<destroy_function>(nullptr) :
       [](TaskUnion& buffer) {
-        F* code = reinterpret_cast<F*>(&buffer);
+        auto* code = reinterpret_cast<F*>(&buffer);
         code->~F();
       },
       // Move:
       [](TaskUnion& dst, TaskUnion& src) {
-        F* src_code = reinterpret_cast<F*>(&src);
-        F* dst_code = reinterpret_cast<F*>(&dst);
+        auto* src_code = reinterpret_cast<F*>(&src);
+        auto* dst_code = reinterpret_cast<F*>(&dst);
         new(dst_code) F(std::move(*src_code));
         src_code->~F();
       }
@@ -221,10 +213,11 @@ private:
   {
     const static TaskVtable vtable {
       // Call:
-      [](TaskUnion& buffer, Args&&... args) {
+      [](TaskUnion& buffer, Args... args) {
         // Delete F when we go out of scope:
         std::unique_ptr<F> code(*reinterpret_cast<F**>(&buffer));
-        return (*code)(std::move(args)...);
+        // NOTE: std::forward<Args>(args)... is correct.
+        return (*code)(std::forward<Args>(args)...);
       },
       // Destroy:
       [](TaskUnion& buffer) {
@@ -244,13 +237,15 @@ public:
   operator bool() const { return vtable_ != nullptr; }
   bool operator!() const { return vtable_ == nullptr; }
 
-  R operator()(Args&&... args)
+  R operator()(Args... args)
   {
     if (vtable_ == nullptr)
       throw std::bad_function_call();
     const TaskVtable* vtable = vtable_;
     vtable_ = nullptr;
-    return vtable->call(buffer_, std::move(args)...);
+    // NOTE: std::forward<Args>(args)... is correct.
+    // see C++ [func.wrap.func.inv] for an example
+    return vtable->call(buffer_, std::forward<Args>(args)...);
   }
 };