Skip to content

Commit 0f26d8c

Browse files
committed
Silence warnings
Signed-off-by: Ralph Castain <rhc@pmix.org>
1 parent c4be211 commit 0f26d8c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

opal/mca/hwloc/base/hwloc_base_util.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved
1414
* Copyright (c) 2012-2017 Los Alamos National Security, LLC.
1515
* All rights reserved.
16-
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
16+
* Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
1717
* Copyright (c) 2015-2017 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
19-
* Copyright (C) 2018 Mellanox Technologies, Ltd.
19+
* Copyright (C) 2018 Mellanox Technologies, Ltd.
2020
* All rights reserved.
2121
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
2222
* Copyright (c) 2019 IBM Corporation. All rights reserved.
@@ -1858,8 +1858,9 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
18581858
hwloc_obj_t root = NULL;
18591859
int depth;
18601860
unsigned i;
1861-
#endif
1861+
#else
18621862
unsigned distances_nr = 0;
1863+
#endif
18631864

18641865
for (device_obj = hwloc_get_obj_by_type(topo, HWLOC_OBJ_OS_DEVICE, 0); device_obj; device_obj = hwloc_get_next_osdev(topo, device_obj)) {
18651866
if (device_obj->attr->osdev.type == HWLOC_OBJ_OSDEV_OPENFABRICS
@@ -1890,7 +1891,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
18901891

18911892
/* find distance matrix for all numa nodes */
18921893
#if HWLOC_API_VERSION < 0x20000
1893-
distances = hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
1894+
distances = (struct hwloc_distances_s*)hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
18941895
if (NULL == distances) {
18951896
/* we can try to find distances under group object. This info can be there. */
18961897
depth = hwloc_get_type_depth(topo, HWLOC_OBJ_NODE);

0 commit comments

Comments
 (0)