Cleanup warnings found when building v1.7

cmr:v1.7

This commit was SVN r28279.

ompi/mca/bcol/basesmuma/bcol_basesmuma_buf_mgmt.c

@@ -413,8 +413,8 @@ int bcol_basesmuma_bank_init_opti(struct mca_coll_ml_module_t *ml_module,
 	/* now we exchange offset info - don't assume symmetric virtual memory
 	 */
 
-        mem_offset = (uint64_t)(ml_block->block->base_addr) -
-            (uint64_t)(cs->sm_payload_structs->data_addr);
+        mem_offset = (uint64_t)(uintptr_t)(ml_block->block->base_addr) -
+            (uint64_t)(uintptr_t)(cs->sm_payload_structs->data_addr);
 
         /* call into the exchange offsets function */
         ret=comm_allgather_pml(&mem_offset,results_array,1,
@@ -444,11 +444,11 @@ int bcol_basesmuma_bank_init_opti(struct mca_coll_ml_module_t *ml_module,
 
         /* first, set the pointer to the control struct */
         pload_mgmt->data_buffs[array_id].ctl_struct=(mca_bcol_basesmuma_header_t *)
-            (((uint64_t)results_array[array_id])+(uint64_t)base_ptr);
+            (uintptr_t)(((uint64_t)(uintptr_t)results_array[array_id])+(uint64_t)(uintptr_t)base_ptr);
         /* second, calculate where to set the data pointer */
         pload_mgmt->data_buffs[array_id].payload=(void *) 
-            ((uint64_t) pload_mgmt->data_buffs[array_id].ctl_struct + 
-             (uint64_t) ml_module->data_offset);
+            (uintptr_t)((uint64_t)(uintptr_t) pload_mgmt->data_buffs[array_id].ctl_struct + 
+                       (uint64_t)(uintptr_t) ml_module->data_offset);
 
 
         for( buf_id = 1 ; buf_id < loop_limit ; buf_id++ ) {
@@ -458,13 +458,13 @@ int bcol_basesmuma_bank_init_opti(struct mca_coll_ml_module_t *ml_module,
              *
              * first, set the control struct's position */
             pload_mgmt->data_buffs[array_id].ctl_struct=(mca_bcol_basesmuma_header_t *) 
-                (((uint64_t)(pload_mgmt->data_buffs[array_id_m1].ctl_struct) +
-                  (uint64_t)ml_block->size_buffer));
+                (uintptr_t)(((uint64_t)(uintptr_t)(pload_mgmt->data_buffs[array_id_m1].ctl_struct) +
+                           (uint64_t)(uintptr_t)ml_block->size_buffer));
 
             /* second, set the payload pointer */
             pload_mgmt->data_buffs[array_id].payload =(void *)
-                ((uint64_t) pload_mgmt->data_buffs[array_id].ctl_struct +
-                 (uint64_t) ml_module->data_offset); 
+                (uintptr_t)((uint64_t)(uintptr_t) pload_mgmt->data_buffs[array_id].ctl_struct +
+                           (uint64_t)(uintptr_t) ml_module->data_offset); 
         }
 
     }

ompi/mca/bcol/basesmuma/bcol_basesmuma_setup.c

@@ -90,7 +90,7 @@ int base_bcol_basesmuma_exchange_offsets(
         memcpy((void *) &rem_mem_offset, (void *) (recv_buff + i*count + sizeof(int)), sizeof(uint64_t));
 
         array_id=SM_ARRAY_INDEX(leading_dim,0,index_in_group);
-        result_array[array_id]=(void *)rem_mem_offset;
+        result_array[array_id]=(void *)(uintptr_t)rem_mem_offset;
 
     }
 
@@ -263,8 +263,8 @@ static int base_bcol_basesmuma_exchange_ctl_params(
     mca_bcol_basesmuma_ctl_struct_t *ctl_ptr;
 
     /* data block base offset in the mapped file */
-    mem_offset=(uint64_t)(data_blk->data)-
-        (uint64_t)cs->sm_ctl_structs->data_addr;
+    mem_offset=(uint64_t)(uintptr_t)(data_blk->data)-
+        (uint64_t)(uintptr_t)cs->sm_ctl_structs->data_addr;
 
     /* number of buffers in data block */
     loop_limit=cs->basesmuma_num_mem_banks+ctl_mgmt->number_of_buffs;
@@ -299,12 +299,12 @@ static int base_bcol_basesmuma_exchange_ctl_params(
             base_ptr=sm_bcol_module->ctl_backing_files_info[i]->sm_mmap->map_addr;
         }
         ctl_mgmt->ctl_buffs[array_id]=(void *)
-            (((uint64_t)ctl_mgmt->ctl_buffs[array_id])+(uint64_t)base_ptr);
+            (uintptr_t)(((uint64_t)(uintptr_t)ctl_mgmt->ctl_buffs[array_id])+(uint64_t)(uintptr_t)base_ptr);
         for( buf_id = 1 ; buf_id < loop_limit ; buf_id++ ) {
             int array_id_m1=SM_ARRAY_INDEX(leading_dim,(buf_id-1),i);
             array_id=SM_ARRAY_INDEX(leading_dim,buf_id,i);
-            ctl_mgmt->ctl_buffs[array_id]=(void *) ((uint64_t)(ctl_mgmt->ctl_buffs[array_id_m1])+
-                (uint64_t)sizeof(mca_bcol_basesmuma_ctl_struct_t));
+            ctl_mgmt->ctl_buffs[array_id]=(void *) (uintptr_t)((uint64_t)(uintptr_t)(ctl_mgmt->ctl_buffs[array_id_m1])+
+                (uint64_t)(uintptr_t)sizeof(mca_bcol_basesmuma_ctl_struct_t));
         }
     }
     /* initialize my control structues */