Skip to content

Commit b4b1c5b

Browse files
committed
Added 'ifdef GCC_GE_8' statements so it builds with GCC 7.3.0, made comment about dst_type and src_type
1 parent 3d485ea commit b4b1c5b

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/mpi/mpi_caf.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
6565
#define dprint(args...) fprintf (stderr, args)
6666
#endif
6767

68-
// Remove before flight!
69-
7068
#ifdef GCC_GE_7
7169
/** The caf-token of the mpi-library.
7270
@@ -4876,7 +4874,7 @@ PREFIX (get_by_ref) (caf_token_t token, int image_index,
48764874
#ifdef GCC_GE_8
48774875
src_type
48784876
#else
4879-
-1
4877+
-1 // should src_type be calculated here? something similar to GFC_DESCRIPTOR_TYPE(mpi_token->desc)
48804878
#endif
48814879
);
48824880
CAF_Win_unlock (remote_image, global_dynamic_win);
@@ -5438,8 +5436,12 @@ PREFIX (send_by_ref) (caf_token_t token, int image_index,
54385436

54395437
check_image_health (image_index, stat);
54405438

5441-
dprint ("%d/%d: Entering send_by_ref(may_require_tmp = %d, dst_type = %d).\n", caf_this_image,
5442-
caf_num_images, may_require_tmp, dst_type);
5439+
dprint ("%d/%d: Entering send_by_ref(may_require_tmp = %d", caf_this_image,
5440+
caf_num_images, may_require_tmp);
5441+
#ifdef GCC_GE_8
5442+
dprint (", dst_type = %d", dst_type);
5443+
#endif
5444+
dprint (").\n");
54435445

54445446
/* Compute the size of the result. In the beginning size just counts the
54455447
number of elements. */
@@ -5840,7 +5842,7 @@ PREFIX (send_by_ref) (caf_token_t token, int image_index,
58405842
#ifdef GCC_GE_8
58415843
dst_type
58425844
#else
5843-
-1
5845+
-1 // should dst_type be calculated here? something similar to GFC_DESCRIPTOR_TYPE(mpi_token->desc)
58445846
#endif
58455847
);
58465848
if (free_temp_src)

0 commit comments

Comments
 (0)