[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-248-g8d6c5ba

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  8d6c5bafc27599b4ca14f9064cad245ee46e91e4 (commit)
      from  1aec69b7095116d9ffb453a9b4c2324ed1a7a1b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/8d6c5bafc27599b4ca14f9064cad245ee46e91e4

commit 8d6c5bafc27599b4ca14f9064cad245ee46e91e4
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Fri Apr 15 09:05:39 2016 -0500

    ROMIO/adioi.h: remove swap macro
    
    Use explicit variable swap instead in the only instance (ad_gpfs).
    
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
index f39e4dc..036aad2 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
@@ -913,7 +913,8 @@ static void ADIOI_Exch_and_write(ADIO_File fd, const void *buf, MPI_Datatype
 		/* do a little pointer shuffling: background I/O works from one
 		 * buffer while two-phase machinery fills up another */
 		io_thread_args.buf = write_buf;
-		ADIOI_SWAP(write_buf, write_buf2, char*);
+		write_buf = write_buf2;
+		write_buf2 = io_thread_args.buf;
 		io_thread_args.io_kind = ADIOI_WRITE;
 		io_thread_args.size = size;
 		io_thread_args.offset = off;
diff --git a/src/mpi/romio/adio/include/adioi.h b/src/mpi/romio/adio/include/adioi.h
index 0b9d8b3..9edffb5 100644
--- a/src/mpi/romio/adio/include/adioi.h
+++ b/src/mpi/romio/adio/include/adioi.h
@@ -215,10 +215,6 @@ struct ADIOI_Fns_struct {
 #define ADIOI_READ                26
 #define ADIOI_WRITE               27
 
-/* thanks stackoverflow:
- * http://stackoverflow.com/questions/3982348/implement-generic-swap-macro-in-c */
-#define ADIOI_SWAP(x, y, T) do { T temp##x##y = x; x = y; y = temp##x##y; } while (0);
-
 #define ADIOI_PREALLOC_BUFSZ      16777216    /* buffer size used to 
                                                 preallocate disk space */
 

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c |    3 ++-
 src/mpi/romio/adio/include/adioi.h          |    4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
MPICH primary repository