From 442a7c3376eb3a0bdde33e546a8146690c677466 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 23 Mar 2017 23:28:16 +0100
Subject: [PATCH] petting sonar as every night before bed

---
 examples/s4u/actor-create/s4u_actor-create.cpp | 2 +-
 include/simgrid/s4u/ConditionVariable.hpp      | 2 +-
 src/smpi/smpi_op.cpp                           | 1 +
 src/surf/trace_mgr.hpp                         | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples/s4u/actor-create/s4u_actor-create.cpp b/examples/s4u/actor-create/s4u_actor-create.cpp
index 61bfeddf8b..f4146a59d0 100644
--- a/examples/s4u/actor-create/s4u_actor-create.cpp
+++ b/examples/s4u/actor-create/s4u_actor-create.cpp
@@ -7,7 +7,7 @@
  *
  * The first step is to declare the code of your actors (what they do exactly does not matter to this example) and then
  * you ask SimGrid to start your actors. There is three ways of doing so:
- *  - Directly, by instantiating your actor as paramter to Actor::create();
+ *  - Directly, by instantiating your actor as paramter to Actor::create()
  *  - By first registering your actors before instantiating it;
  *  - Through the deployment file.
  *
diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp
index 2ccf89d5e9..c087a0e5ef 100644
--- a/include/simgrid/s4u/ConditionVariable.hpp
+++ b/include/simgrid/s4u/ConditionVariable.hpp
@@ -35,7 +35,7 @@ XBT_PUBLIC_CLASS ConditionVariable
 private:
   friend s_smx_cond;
   smx_cond_t cond_;
-  ConditionVariable(smx_cond_t cond) : cond_(cond) {}
+  explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {}
 public:
   ConditionVariable(ConditionVariable const&) = delete;
   ConditionVariable& operator=(ConditionVariable const&) = delete;
diff --git a/src/smpi/smpi_op.cpp b/src/smpi/smpi_op.cpp
index 5ef10681d2..5d3136e8f2 100644
--- a/src/smpi/smpi_op.cpp
+++ b/src/smpi/smpi_op.cpp
@@ -190,6 +190,7 @@ static void replace_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 
 static void no_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
+  /* obviously a no-op */
 }
 
 #define CREATE_MPI_OP(name, func)                             \
diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp
index ac19633e50..3b4761a6e5 100644
--- a/src/surf/trace_mgr.hpp
+++ b/src/surf/trace_mgr.hpp
@@ -41,7 +41,7 @@ XBT_PUBLIC(void) tmgr_trace_event_unref(tmgr_trace_iterator_t *trace_event);
 XBT_PUBLIC(void) tmgr_finalize(void);
 
 XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char* filename);
-XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char* id, std::string, double periodicity);
+XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char* id, std::string input, double periodicity);
 
 SG_END_DECL()
 
-- 
2.20.1