From f55eaf0771a58b3a49a2c7cdf1673598e24dd759 Mon Sep 17 00:00:00 2001
From: Kai Germaschewski <kai.germaschewski@unh.edu>
Date: Mon, 1 Apr 2019 10:11:58 -0400
Subject: [PATCH] mpi_aggregator: use MPI_STATUS_IGNORE

where we're ignoring the status anyway (which is everywhere).
---
 source/adios2/toolkit/aggregator/mpi/MPIAggregator.cpp |  5 ++---
 source/adios2/toolkit/aggregator/mpi/MPIChain.cpp      | 10 ++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/source/adios2/toolkit/aggregator/mpi/MPIAggregator.cpp b/source/adios2/toolkit/aggregator/mpi/MPIAggregator.cpp
index a379dcf273..018eaece93 100644
--- a/source/adios2/toolkit/aggregator/mpi/MPIAggregator.cpp
+++ b/source/adios2/toolkit/aggregator/mpi/MPIAggregator.cpp
@@ -80,13 +80,12 @@ void MPIAggregator::WaitAbsolutePosition(const int step)
         return;
     }
 
-    MPI_Status status;
     const int destination = (step != m_Size - 1) ? step + 1 : 0;
 
     if (m_Rank == destination)
     {
         helper::CheckMPIReturn(
-            MPI_Wait(&m_AbsolutePositionRequests[1], &status),
+            MPI_Wait(&m_AbsolutePositionRequests[1], MPI_STATUS_IGNORE),
             ", aggregation Irecv Wait absolute position at iteration " +
                 std::to_string(step) + "\n");
     }
@@ -94,7 +93,7 @@ void MPIAggregator::WaitAbsolutePosition(const int step)
     if (m_Rank == step)
     {
         helper::CheckMPIReturn(
-            MPI_Wait(&m_AbsolutePositionRequests[0], &status),
+            MPI_Wait(&m_AbsolutePositionRequests[0], MPI_STATUS_IGNORE),
             ", aggregation Isend Wait absolute position at iteration " +
                 std::to_string(step) + "\n");
     }
diff --git a/source/adios2/toolkit/aggregator/mpi/MPIChain.cpp b/source/adios2/toolkit/aggregator/mpi/MPIChain.cpp
index 4730f6ddce..140d626527 100644
--- a/source/adios2/toolkit/aggregator/mpi/MPIChain.cpp
+++ b/source/adios2/toolkit/aggregator/mpi/MPIChain.cpp
@@ -96,11 +96,10 @@ void MPIChain::Wait(const int step)
     const bool sender = (m_Rank >= 1 && m_Rank <= endRank) ? true : false;
     const bool receiver = (m_Rank < endRank) ? true : false;
 
-    MPI_Status status;
     if (receiver)
     {
         helper::CheckMPIReturn(
-            MPI_Wait(&m_DataRequests[2], &status),
+            MPI_Wait(&m_DataRequests[2], MPI_STATUS_IGNORE),
             ", aggregation waiting for receiver data at iteration " +
                 std::to_string(step) + "\n");
     }
@@ -108,12 +107,12 @@ void MPIChain::Wait(const int step)
     if (sender)
     {
         helper::CheckMPIReturn(
-            MPI_Wait(&m_DataRequests[0], &status),
+            MPI_Wait(&m_DataRequests[0], MPI_STATUS_IGNORE),
             ", aggregation waiting for sender size at iteration " +
                 std::to_string(step) + "\n");
 
         helper::CheckMPIReturn(
-            MPI_Wait(&m_DataRequests[1], &status),
+            MPI_Wait(&m_DataRequests[1], MPI_STATUS_IGNORE),
             ", aggregation waiting for sender data at iteration " +
                 std::to_string(step) + "\n");
     }
@@ -154,9 +153,8 @@ void MPIChain::HandshakeLinks()
 
     if (m_Rank > 0)
     {
-        MPI_Status sendStatus;
         helper::CheckMPIReturn(
-            MPI_Wait(&sendRequest, &sendStatus),
+            MPI_Wait(&sendRequest, MPI_STATUS_IGNORE),
             "Isend wait handshake with neighbor, MPIChain aggregator, at Open");
     }
 }