Merge pull request #8255 from jsquyres/pr/v4.1.x/fix-missed-warnings
v4.1.x: Fix missed compiler warnings
Этот коммит содержится в:
Raghu Raja
GitHub
Коммит
6e2c8cfcba
@ -257,7 +257,7 @@ static int free_vecs_callback(struct ompi_request_t **rptr) {
|
||||
}
|
||||
|
||||
int ompi_coll_base_retain_datatypes_w( ompi_request_t *req,
|
||||
ompi_datatype_t *stypes[], ompi_datatype_t *rtypes[]) {
|
||||
ompi_datatype_t *const stypes[], ompi_datatype_t *const rtypes[]) {
|
||||
ompi_coll_base_nbc_request_t *request = (ompi_coll_base_nbc_request_t *)req;
|
||||
bool retain = false;
|
||||
ompi_communicator_t *comm = request->super.req_mpi_object.comm;
|
||||
|
||||
@ -174,8 +174,8 @@ int ompi_coll_base_retain_datatypes( ompi_request_t *request,
|
||||
* (will be cast internally).
|
||||
*/
|
||||
int ompi_coll_base_retain_datatypes_w( ompi_request_t *request,
|
||||
ompi_datatype_t *stypes[],
|
||||
ompi_datatype_t *rtypes[]);
|
||||
ompi_datatype_t * const stypes[],
|
||||
ompi_datatype_t * const rtypes[]);
|
||||
|
||||
/* File reading function */
|
||||
int ompi_coll_base_file_getnext_long(FILE *fptr, int *fileline, long* val);
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
/*
|
||||
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights
|
||||
* reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -36,23 +38,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#ifdef HAVE_NET_IF_H
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
/* Apple engineering suggested using options align=power as a
|
||||
workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
|
||||
SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
|
||||
It turns out that the underlying issue is the size of struct
|
||||
ifconf, which the kernel expects to be 12 and natural 64 bit
|
||||
alignment would make 16. The same bug appears in 64 bit mode on
|
||||
Intel macs, but align=power is a no-op there, so instead, use the
|
||||
pack pragma to instruct the compiler to pack on 4 byte words, which
|
||||
has the same effect as align=power for our needs and works on both
|
||||
Intel and Power PC Macs. */
|
||||
#pragma pack(push,4)
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
#pragma pack(pop)
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
* Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights
|
||||
* reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -39,23 +41,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#ifdef HAVE_NET_IF_H
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
/* Apple engineering suggested using options align=power as a
|
||||
workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
|
||||
SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
|
||||
It turns out that the underlying issue is the size of struct
|
||||
ifconf, which the kernel expects to be 12 and natural 64 bit
|
||||
alignment would make 16. The same bug appears in 64 bit mode on
|
||||
Intel macs, but align=power is a no-op there, so instead, use the
|
||||
pack pragma to instruct the compiler to pack on 4 byte words, which
|
||||
has the same effect as align=power for our needs and works on both
|
||||
Intel and Power PC Macs. */
|
||||
#pragma pack(push,4)
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
#pragma pack(pop)
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
/*
|
||||
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights
|
||||
* reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -34,23 +36,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#ifdef HAVE_NET_IF_H
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
/* Apple engineering suggested using options align=power as a
|
||||
workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
|
||||
SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
|
||||
It turns out that the underlying issue is the size of struct
|
||||
ifconf, which the kernel expects to be 12 and natural 64 bit
|
||||
alignment would make 16. The same bug appears in 64 bit mode on
|
||||
Intel macs, but align=power is a no-op there, so instead, use the
|
||||
pack pragma to instruct the compiler to pack on 4 byte words, which
|
||||
has the same effect as align=power for our needs and works on both
|
||||
Intel and Power PC Macs. */
|
||||
#pragma pack(push,4)
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
#pragma pack(pop)
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
|
||||
@ -34,15 +34,27 @@ AC_DEFUN([MCA_opal_memory_patcher_COMPILE_MODE], [
|
||||
# [action-if-cant-compile])
|
||||
# ------------------------------------------------
|
||||
AC_DEFUN([MCA_opal_memory_patcher_CONFIG],[
|
||||
# disable on MacOS/Darwin where it isn't used and the deprecated
|
||||
# syscall interface causes compiler warnings.
|
||||
AC_MSG_CHECKING([if memory patcher supports $host_os])
|
||||
case $host_os in
|
||||
darwin*)
|
||||
opal_memory_patcher_happy=no
|
||||
;;
|
||||
*)
|
||||
opal_memory_patcher_happy=yes
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$opal_memory_patcher_happy])
|
||||
|
||||
AS_IF([test "$opal_memory_patcher_happy" == "yes"], [
|
||||
AC_CHECK_FUNCS([__curbrk])
|
||||
AC_CHECK_HEADERS([linux/mman.h sys/syscall.h])
|
||||
AC_CHECK_DECLS([__mmap], [], [], [#include <sys/mman.h>])
|
||||
AC_CHECK_FUNCS([__mmap])
|
||||
AC_CHECK_DECLS([__syscall], [], [], [#include <sys/syscall.h>])
|
||||
AC_CHECK_FUNCS([__syscall])
|
||||
$1], [$2])
|
||||
|
||||
AC_CONFIG_FILES([opal/mca/memory/patcher/Makefile])
|
||||
|
||||
AC_CHECK_FUNCS([__curbrk])
|
||||
|
||||
AC_CHECK_HEADERS([linux/mman.h sys/syscall.h])
|
||||
|
||||
AC_CHECK_DECLS([__syscall], [], [], [#include <sys/syscall.h>])
|
||||
|
||||
AC_CHECK_FUNCS([__syscall])
|
||||
|
||||
[$1]
|
||||
])
|
||||
|
||||
@ -16,6 +16,8 @@
|
||||
* reserved.
|
||||
* Copyright (c) 2015-2016 Research Organization for Information Science
|
||||
* and Technology (RIST). All rights reserved.
|
||||
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights
|
||||
* reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -49,23 +51,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#ifdef HAVE_NET_IF_H
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
/* Apple engineering suggested using options align=power as a
|
||||
workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
|
||||
SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
|
||||
It turns out that the underlying issue is the size of struct
|
||||
ifconf, which the kernel expects to be 12 and natural 64 bit
|
||||
alignment would make 16. The same bug appears in 64 bit mode on
|
||||
Intel macs, but align=power is a no-op there, so instead, use the
|
||||
pack pragma to instruct the compiler to pack on 4 byte words, which
|
||||
has the same effect as align=power for our needs and works on both
|
||||
Intel and Power PC Macs. */
|
||||
#pragma pack(push,4)
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
#pragma pack(pop)
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
|
||||
@ -15,6 +15,8 @@
|
||||
* Copyright (c) 2013 Intel, Inc. All rights reserved.
|
||||
* Copyright (c) 2015 Research Organization for Information Science
|
||||
* and Technology (RIST). All rights reserved.
|
||||
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights
|
||||
* reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -49,23 +51,7 @@
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#ifdef HAVE_NET_IF_H
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
/* Apple engineering suggested using options align=power as a
|
||||
workaround for a bug in OS X 10.4 (Tiger) that prevented ioctl(...,
|
||||
SIOCGIFCONF, ...) from working properly in 64 bit mode on Power PC.
|
||||
It turns out that the underlying issue is the size of struct
|
||||
ifconf, which the kernel expects to be 12 and natural 64 bit
|
||||
alignment would make 16. The same bug appears in 64 bit mode on
|
||||
Intel macs, but align=power is a no-op there, so instead, use the
|
||||
pack pragma to instruct the compiler to pack on 4 byte words, which
|
||||
has the same effect as align=power for our needs and works on both
|
||||
Intel and Power PC Macs. */
|
||||
#pragma pack(push,4)
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
#if defined(__APPLE__) && defined(_LP64)
|
||||
#pragma pack(pop)
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user