[mpich2-commits] r4228 - mpich2/trunk/src/mpi/coll

[goodell at mcs.anl.gov]

Author: goodell
Date: 2009-03-31 12:56:21 -0500 (Tue, 31 Mar 2009)
New Revision: 4228

Modified:
   mpich2/trunk/src/mpi/coll/helper_fns.c
Log:
Fix for MPIR_Localcopy with non-standard MPI_Aint sizes (ticket #505).

Reviewed by buntinas at .

Modified: mpich2/trunk/src/mpi/coll/helper_fns.c
===================================================================
--- mpich2/trunk/src/mpi/coll/helper_fns.c	2009-03-31 00:40:19 UTC (rev 4227)
+++ mpich2/trunk/src/mpi/coll/helper_fns.c	2009-03-31 17:56:21 UTC (rev 4228)
@@ -231,17 +231,17 @@
     else if (sendtype_iscontig)
     {
         MPID_Segment seg;
-	MPIDI_msg_sz_t last;
+	MPI_Aint last;
 
 	MPID_Segment_init(recvbuf, recvcount, recvtype, &seg, 0);
 	last = copy_sz;
 	MPID_Segment_unpack(&seg, 0, &last, (char*)sendbuf + sendtype_true_lb);
-        MPIU_ERR_CHKANDJUMP(last != copy_sz, mpi_errno, MPI_ERR_TYPE, "**dtypemismatch");        
+        MPIU_ERR_CHKANDJUMP(last != copy_sz, mpi_errno, MPI_ERR_TYPE, "**dtypemismatch");
     }
     else if (recvtype_iscontig)
     {
         MPID_Segment seg;
-	MPIDI_msg_sz_t last;
+	MPI_Aint last;
 
 	MPID_Segment_init(sendbuf, sendcount, sendtype, &seg, 0);
 	last = copy_sz;
@@ -256,9 +256,9 @@
 	MPIDI_msg_sz_t sfirst;
 	MPID_Segment rseg;
 	MPIDI_msg_sz_t rfirst;
-        
-        MPIU_CHKLMEM_MALLOC(buf, char *, COPY_BUFFER_SZ, mpi_errno, "buf"); 
 
+        MPIU_CHKLMEM_MALLOC(buf, char *, COPY_BUFFER_SZ, mpi_errno, "buf");
+
 	MPID_Segment_init(sendbuf, sendcount, sendtype, &sseg, 0);
 	MPID_Segment_init(recvbuf, recvcount, recvtype, &rseg, 0);