Add some "explicit" keyword (sonar, codacy).

diff --git a/include/xbt/Extendable.hpp b/include/xbt/Extendable.hpp
index 1da9b31..785e337 100644 (file)
--- a/include/xbt/Extendable.hpp
+++ b/include/xbt/Extendable.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015. The SimGrid Team.
+/* Copyright (c) 2015, 2017. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -22,7 +22,7 @@ class Extension {
   static const std::size_t INVALID_ID = std::numeric_limits<std::size_t>::max();
   std::size_t id_;
   friend class Extendable<T>;
   static const std::size_t INVALID_ID = std::numeric_limits<std::size_t>::max();
   std::size_t id_;
   friend class Extendable<T>;

-  constexpr Extension(std::size_t id) : id_(id) {}
+  explicit constexpr Extension(std::size_t id) : id_(id) {}

 public:
   explicit constexpr Extension() : id_(INVALID_ID) {}
   std::size_t id() const { return id_; }
 public:
   explicit constexpr Extension() : id_(INVALID_ID) {}
   std::size_t id() const { return id_; }


@@ -64,7 +64,7 @@ public:
   template<class U> static
   Extension<T,U> extension_create()
   {
   template<class U> static
   Extension<T,U> extension_create()
   {

-    return extension_create([](void* p){ delete static_cast<U*>(p); });
+    return Extension<T, U>(extension_create([](void* p) { delete static_cast<U*>(p); }));

   }
   Extendable() : extensions_(deleters_.size(), nullptr) {}
   ~Extendable()
   }
   Extendable() : extensions_(deleters_.size(), nullptr) {}
   ~Extendable()

diff --git a/include/xbt/exception.hpp b/include/xbt/exception.hpp
index 7c826cd..3d648a1 100644 (file)
--- a/include/xbt/exception.hpp
+++ b/include/xbt/exception.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2016. The SimGrid Team.All rights reserved. */
+/* Copyright (c) 2005-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. */
 
 /* 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. */


@@ -99,8 +99,7 @@ class WithContext : public E, public WithContextException
 public:
   static_assert(not std::is_base_of<WithContextException, E>::value, "Trying to appli WithContext twice");
 
 public:
   static_assert(not std::is_base_of<WithContextException, E>::value, "Trying to appli WithContext twice");
 

-  WithContext(E exception) :
-    E(std::move(exception)) {}
+  explicit WithContext(E exception) : E(std::move(exception)) {}

   WithContext(E exception, ThrowPoint throwpoint, Backtrace backtrace) :
     E(std::move(exception)),
     WithContextException(throwpoint, std::move(backtrace)) {}
   WithContext(E exception, ThrowPoint throwpoint, Backtrace backtrace) :
     E(std::move(exception)),
     WithContextException(throwpoint, std::move(backtrace)) {}

diff --git a/include/xbt/range.hpp b/include/xbt/range.hpp
index 5c20a9c..be1e7e8 100644 (file)
--- a/include/xbt/range.hpp
+++ b/include/xbt/range.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016. The SimGrid Team.
+/* Copyright (c) 2016-2017. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -17,7 +17,7 @@ template<class T> class Range {
 public:
   Range()               : begin_(), end_() {}
   Range(T begin, T end) : begin_(std::move(begin)), end_(std::move(end)) {}
 public:
   Range()               : begin_(), end_() {}
   Range(T begin, T end) : begin_(std::move(begin)), end_(std::move(end)) {}

-  Range(T value) : begin_(value), end_(value + 1) {}
+  explicit Range(T value) : begin_(value), end_(value + 1) {}

   T& begin()             { return begin_; }
   T& end()               { return end_; }
   const T& begin() const { return begin_; }
   T& begin()             { return begin_; }
   T& end()               { return end_; }
   const T& begin() const { return begin_; }

diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp
index ae6728c..e610b81 100644 (file)
--- a/include/xbt/string.hpp
+++ b/include/xbt/string.hpp
@@ -98,7 +98,7 @@ public:
     s.string_data::len = 0;
     s.string_data::data = &NUL;
   }
     s.string_data::len = 0;
     s.string_data::data = &NUL;
   }

-  string(std::string const& s) : string(s.c_str(), s.size()) {}
+  explicit string(std::string const& s) : string(s.c_str(), s.size()) {}

 
   // Assign
   void assign(const char* s, size_t size)
 
   // Assign
   void assign(const char* s, size_t size)

diff --git a/src/mc/DwarfExpression.hpp b/src/mc/DwarfExpression.hpp
index defb89c..38bcbca 100644 (file)
--- a/src/mc/DwarfExpression.hpp
+++ b/src/mc/DwarfExpression.hpp
@@ -58,7 +58,7 @@ public:
 /** When an error happens in the execution of a DWARF expression */
 class evaluation_error : std::runtime_error {
 public:
 /** When an error happens in the execution of a DWARF expression */
 class evaluation_error : std::runtime_error {
 public:

-  evaluation_error(const char* what): std::runtime_error(what) {}
+  explicit evaluation_error(const char* what) : std::runtime_error(what) {}

 };
 
 /** A stack for evaluating a DWARF expression
 };
 
 /** A stack for evaluating a DWARF expression

diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index 8e4aee3..807291e 100644 (file)
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -37,7 +37,9 @@ public:
   LocationListEntry(DwarfExpression expression, range_type range)
     : expression_(std::move(expression)), range_(range)
   {}
   LocationListEntry(DwarfExpression expression, range_type range)
     : expression_(std::move(expression)), range_(range)
   {}

-  LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX}) {}
+  explicit LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX})
+  {
+  }

 
   DwarfExpression& expression()
   {
 
   DwarfExpression& expression()
   {

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index 88e1369..5e95580 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -776,7 +776,7 @@ static std::unique_ptr<simgrid::mc::Variable> MC_die_to_variable(
         variable->address = (void *) (base + offset);
       } else
         variable->location_list = {
         variable->address = (void *) (base + offset);
       } else
         variable->location_list = {

-          simgrid::dwarf::DwarfExpression(expr, expr + len) };
+            simgrid::dwarf::LocationListEntry(simgrid::dwarf::DwarfExpression(expr, expr + len))};

 
       break;
     }
 
       break;
     }

diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp
index edef946..d14e7fd 100644 (file)
--- a/src/mc/mc_state.hpp
+++ b/src/mc/mc_state.hpp
@@ -125,7 +125,7 @@ public:
   std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern;
   std::vector<unsigned> communicationIndices;
 
   std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern;
   std::vector<unsigned> communicationIndices;
 

-  State(unsigned long state_number);
+  explicit State(unsigned long state_number);

 
   std::size_t interleaveSize() const;
   void addInterleavingSet(smx_actor_t actor) { this->actorStates[actor->pid].consider(); }
 
   std::size_t interleaveSize() const;
   void addInterleavingSet(smx_actor_t actor) { this->actorStates[actor->pid].consider(); }