Skip to content

Commit 28d9340

Browse files
igor-ivanovhjelmn
authored andcommitted
oshmem: Fix compilation warnings
(cherry picked from open-mpi/ompi@ec7cd13)
1 parent dbd8161 commit 28d9340

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

oshmem/mca/scoll/mpi/scoll_mpi_module.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "ompi_config.h"
1414
#include "scoll_mpi.h"
1515
#include "oshmem/proc/proc.h"
16+
#include "oshmem/runtime/runtime.h"
1617
#include "ompi/mca/coll/base/base.h"
1718

1819
int mca_scoll_mpi_init_query(bool enable_progress_threads, bool enable_mpi_threads)

oshmem/mca/spml/ikrit/spml_ikrit.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,6 @@ extern int mca_spml_ikrit_del_procs(oshmem_proc_t** procs, size_t nprocs);
166166
extern int mca_spml_ikrit_fence(void);
167167
extern int spml_ikrit_progress(void);
168168

169-
static inline oshmem_proc_t *mca_spml_ikrit_proc_find(int dst)
170-
{
171-
orte_process_name_t name;
172-
173-
name.jobid = ORTE_PROC_MY_NAME->jobid;
174-
name.vpid = dst;
175-
return oshmem_proc_find(&name);
176-
}
177-
178169
END_C_DECLS
179170

180171
#endif

oshmem/proc/proc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static inline oshmem_proc_t *oshmem_proc_local(void)
147147
*/
148148
static inline oshmem_proc_t *oshmem_proc_for_find(const orte_process_name_t name)
149149
{
150-
return (oshmem_proc_t *)ompi_proc_for_name((const opal_process_name_t)name);
150+
return (oshmem_proc_t *)ompi_proc_for_name(name);
151151
}
152152

153153
static inline oshmem_proc_t *oshmem_proc_find(int pe)
@@ -281,7 +281,7 @@ static inline int oshmem_proc_group_is_member(oshmem_group_t *group)
281281
static inline int oshmem_num_procs(void)
282282
{
283283
return (oshmem_group_all ?
284-
oshmem_group_all->proc_count : opal_list_get_size(&ompi_proc_list));
284+
oshmem_group_all->proc_count : (int)opal_list_get_size(&ompi_proc_list));
285285
}
286286

287287
static inline int oshmem_my_proc_id(void)

0 commit comments

Comments
 (0)