Author: gropp Date: 2012-12-09 23:09:50 -0600 (Sun, 09 Dec 2012) New Revision: 10747 Modified: mpich2/trunk/src/include/mpi.h.in mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c Log: Correct error class (late change to MPI-3 removed the WRONG from the error class Modified: mpich2/trunk/src/include/mpi.h.in =================================================================== --- mpich2/trunk/src/include/mpi.h.in 2012-12-10 03:46:26 UTC (rev 10746) +++ mpich2/trunk/src/include/mpi.h.in 2012-12-10 05:09:50 UTC (rev 10747) @@ -782,10 +782,10 @@ #define MPIX_ERR_PROC_FAIL_STOP 54 /* Process failure */ -#define MPI_ERR_RMA_RANGE 55 /* */ -#define MPI_ERR_RMA_ATTACH 56 /* */ -#define MPI_ERR_RMA_SHARED 57 /* */ -#define MPI_ERR_RMA_WRONG_FLAVOR 58 /* */ +#define MPI_ERR_RMA_RANGE 55 /* */ +#define MPI_ERR_RMA_ATTACH 56 /* */ +#define MPI_ERR_RMA_SHARED 57 /* */ +#define MPI_ERR_RMA_FLAVOR 58 /* */ #define MPI_ERR_LASTCODE 0x3fffffff /* Last valid error code for a predefined error class */ Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c =================================================================== --- mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c 2012-12-10 03:46:26 UTC (rev 10746) +++ mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c 2012-12-10 05:09:50 UTC (rev 10747) @@ -23,7 +23,7 @@ comm_size = win_ptr->comm_ptr->local_size; if (win_ptr->create_flavor != MPI_WIN_FLAVOR_SHARED) { - MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_RMA_WRONG_FLAVOR, "**winflavor"); + MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_RMA_FLAVOR, "**winflavor"); } /* Scan the sizes to locate the first process that allocated a nonzero