From d4c379d0ed64d71ef35171ac104bedf98886c03b Mon Sep 17 00:00:00 2001
From: Christian Heinrich <franz-christian.heinrich@inria.fr>
Date: Tue, 17 Oct 2017 17:42:42 +0200
Subject: [PATCH] [SMPI] Moved local address to for-initializer

---
 src/smpi/internals/smpi_global.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 5fc43b3d55..b47e090c9c 100644
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -355,8 +355,6 @@ void smpi_global_init()
 
 void smpi_global_destroy()
 {
-  int count = smpi_process_count();
-
   smpi_bench_destroy();
   smpi_shared_destroy();
   if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED){
@@ -365,7 +363,7 @@ void smpi_global_destroy()
   }else{
       smpi_deployment_cleanup_instances();
   }
-  for (int i = 0; i < count; i++) {
+  for (int i = 0, count = smpi_process_count(); i < count; i++) {
     if(process_data[i]->comm_self()!=MPI_COMM_NULL){
       simgrid::smpi::Comm::destroy(process_data[i]->comm_self());
     }
-- 
2.20.1