From 100576aab36daab0f4674d9a6c1044925bc8853c Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 1 Nov 2017 09:48:02 +0100
Subject: [PATCH] Sonar: extract assignment from expression.

---
 src/mc/checker/LivenessChecker.cpp | 3 ++-
 src/msg/instr_msg_process.cpp      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp
index 902246d338..3ff91d3e51 100644
--- a/src/mc/checker/LivenessChecker.cpp
+++ b/src/mc/checker/LivenessChecker.cpp
@@ -301,7 +301,8 @@ std::vector<std::string> LivenessChecker::getTextualTrace() // override
 std::shared_ptr<Pair> LivenessChecker::newPair(Pair* current_pair, xbt_automaton_state_t state,
                                                std::shared_ptr<const std::vector<int>> propositions)
 {
-  std::shared_ptr<Pair> next_pair = std::make_shared<Pair>(++expandedPairsCount_);
+  expandedPairsCount_++;
+  std::shared_ptr<Pair> next_pair = std::make_shared<Pair>(expandedPairsCount_);
   next_pair->automaton_state      = state;
   next_pair->graph_state          = std::shared_ptr<simgrid::mc::State>(new simgrid::mc::State(++expandedStatesCount_));
   next_pair->atomic_propositions  = std::move(propositions);
diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index 7f252d0a2c..ceaafb28fc 100644
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -20,7 +20,8 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
   if (TRACE_msg_process_is_enabled()){
     static long long int counter = 0;
 
-    std::string key = std::to_string(counter++);
+    std::string key = std::to_string(counter);
+    counter++;
 
     //start link
     container_t msg                = simgrid::instr::Container::byName(instr_pid(process));
-- 
2.20.1