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 8a5e24404f4ed060c083008cd7a5b8ba4c216c73 (commit) from 096302d9f9c7b06439185feb82c3ea497909281f (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/8a5e24404f4ed060c083008cd7a5b8ba4c... commit 8a5e24404f4ed060c083008cd7a5b8ba4c216c73 Author: Rob Latham <[email protected]> Date: Mon Feb 29 13:23:05 2016 -0600 mainline bug fix: struct and zero-length elements if items with a zero-length block length are given, update the flat->count accordingly (as is already done in indexed and hindexed cases) No Reviewer diff --git a/src/mpi/romio/adio/common/flatten.c b/src/mpi/romio/adio/common/flatten.c index d6b1013..398e7ab 100644 --- a/src/mpi/romio/adio/common/flatten.c +++ b/src/mpi/romio/adio/common/flatten.c @@ -717,6 +717,9 @@ void ADIOI_Flatten(MPI_Datatype datatype, ADIOI_Flatlist_node *flat, DBG_FPRINTF(stderr,"ADIOI_Flatten:: simple adds[%#X] "MPI_AINT_FMT_HEX_SPEC", flat->indices[%#llX] %#llX, flat->blocklens[%#llX] %#llX\n",n,adds[n],j, flat->indices[j], j, flat->blocklens[j]); #endif (*curr_index)++; + } else { + flat->count--; /* don't count/consider any zero-length + blocklens */ } } else { ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/flatten.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository