issue 493

neok-m4700 · neok-m4700 · commit 4db83f0f7b92 · 2018-02-08T09:44:37.000+01:00
diff --git a/src/mpi/mpi_caf.c b/src/mpi/mpi_caf.c
@@ -4627,8 +4627,9 @@ PREFIX (get_by_ref) (caf_token_t token, int image_index,
                         }
                     }
 
-                  /* Only increase the dim counter, when in an array ref.  */
-                  if (in_array_ref && dst_cur_dim < dst_rank)
+                  /* Only increase the dim counter, when in an array ref, and
+                     MODE != CAF_ARR_REF_SINGLE (delta == 1) see caf_array_ref_t. */
+                  if (in_array_ref && dst_cur_dim < dst_rank && delta != 1)
                     ++dst_cur_dim;
                 }
               size *= (ptrdiff_t)delta;
@@ -4775,8 +4776,9 @@ PREFIX (get_by_ref) (caf_token_t token, int image_index,
                           dst->dim[dst_cur_dim]._stride = size;
                         }
                     }
-                  /* Only increase the dim counter, when in an array ref.  */
-                  if (in_array_ref && dst_cur_dim < dst_rank)
+                  /* Only increase the dim counter, when in an array ref, and
+                     MODE != CAF_ARR_REF_SINGLE (delta == 1) see caf_array_ref_t. */
+                  if (in_array_ref && dst_cur_dim < dst_rank && delta != 1)
                     ++dst_cur_dim;
                 }
               size *= (ptrdiff_t)delta;

Original file line number	Diff line number	Diff line change
`@@ -4627,8 +4627,9 @@ PREFIX (get_by_ref) (caf_token_t token, int image_index,`
`4627`	`4627`	`}`
`4628`	`4628`	`}`
`4629`	`4629`
`4630`		`- /* Only increase the dim counter, when in an array ref. */`
`4631`		`- if (in_array_ref && dst_cur_dim < dst_rank)`
	`4630`	`+ /* Only increase the dim counter, when in an array ref, and`
	`4631`	`+ MODE != CAF_ARR_REF_SINGLE (delta == 1) see caf_array_ref_t. */`
	`4632`	`+ if (in_array_ref && dst_cur_dim < dst_rank && delta != 1)`
`4632`	`4633`	`++dst_cur_dim;`
`4633`	`4634`	`}`
`4634`	`4635`	`size *= (ptrdiff_t)delta;`
`@@ -4775,8 +4776,9 @@ PREFIX (get_by_ref) (caf_token_t token, int image_index,`
`4775`	`4776`	`dst->dim[dst_cur_dim]._stride = size;`
`4776`	`4777`	`}`
`4777`	`4778`	`}`
`4778`		`- /* Only increase the dim counter, when in an array ref. */`
`4779`		`- if (in_array_ref && dst_cur_dim < dst_rank)`
	`4779`	`+ /* Only increase the dim counter, when in an array ref, and`
	`4780`	`+ MODE != CAF_ARR_REF_SINGLE (delta == 1) see caf_array_ref_t. */`
	`4781`	`+ if (in_array_ref && dst_cur_dim < dst_rank && delta != 1)`
`4780`	`4782`	`++dst_cur_dim;`
`4781`	`4783`	`}`
`4782`	`4784`	`size *= (ptrdiff_t)delta;`