Skip to content

Commit 78c8031

Browse files
committed
Fix most warnings when compiling w/ clang
- Issue with a type_def persists; non-constant member does not appear last
1 parent 472569e commit 78c8031

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/libcaf-gfortran-descriptor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ typedef struct gfc_descriptor_t {
104104
#endif
105105

106106
#define GFC_DTYPE_SIZE_MASK \
107-
((~((ptrdiff_t) 0) >> GFC_DTYPE_SIZE_SHIFT) << GFC_DTYPE_SIZE_SHIFT)
107+
( ~((ptrdiff_t)(1 << GFC_DTYPE_SIZE_SHIFT) - 1)) // least significant bits to 0
108108
#define GFC_DTYPE_TYPE_SIZE_MASK (GFC_DTYPE_SIZE_MASK | GFC_DTYPE_TYPE_MASK)
109109

110110
#define GFC_DTYPE_INTEGER_1 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \

src/mpi/mpi_caf.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6304,7 +6304,8 @@ PREFIX(is_present) (caf_token_t token, int image_index, caf_reference_t *refs)
63046304
/* The first descriptor is accessible by the
63056305
mpi_token->memptr_win.
63066306
Count the dims to fetch. */
6307-
for (ref_rank = 0; riter->u.a.mode[ref_rank] != CAF_ARR_REF_NONE; ++ref_rank) ;
6307+
for (ref_rank = 0; riter->u.a.mode[ref_rank] != CAF_ARR_REF_NONE; ++ref_rank)
6308+
;
63086309
dprint ("%d/%d: %s() Getting remote descriptor of rank %d from win: %p, sizeof() %d\n",
63096310
caf_this_image, caf_num_images, __FUNCTION__,
63106311
ref_rank, mpi_token->memptr_win, sizeof_desc_for_rank(ref_rank));
@@ -6317,7 +6318,8 @@ PREFIX(is_present) (caf_token_t token, int image_index, caf_reference_t *refs)
63176318
{
63186319
/* All inner descriptors go by the dynamic window.
63196320
Count the dims to fetch. */
6320-
for (ref_rank = 0; riter->u.a.mode[ref_rank] != CAF_ARR_REF_NONE; ++ref_rank) ;
6321+
for (ref_rank = 0; riter->u.a.mode[ref_rank] != CAF_ARR_REF_NONE; ++ref_rank)
6322+
;
63216323
dprint ("%d/%d: %s() Getting remote descriptor of rank %d from: %p, sizeof() %d\n",
63226324
caf_this_image, caf_num_images, __FUNCTION__,
63236325
ref_rank, remote_base_memptr, sizeof_desc_for_rank(ref_rank));

0 commit comments

Comments
 (0)