Skip to content

Commit df6d763

Browse files
committed
configury: remove references to unused OMPI_PROTECTED
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent b10a60a commit df6d763

File tree

4 files changed

+4
-73
lines changed

4 files changed

+4
-73
lines changed

config/ompi_fortran_check_protected.m4

Lines changed: 0 additions & 44 deletions
This file was deleted.

config/ompi_setup_mpi_fortran.m4

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dnl Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
1616
dnl reserved.
1717
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
18-
dnl Copyright (c) 2014-2017 Research Organization for Information Science
19-
dnl and Technology (RIST). All rights reserved.
18+
dnl Copyright (c) 2014-2019 Research Organization for Information Science
19+
dnl and Technology (RIST). All rights reserved.
2020
dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
2121
dnl Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
2222
dnl $COPYRIGHT$
@@ -487,14 +487,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
487487
[OMPI_FORTRAN_HAVE_PRIVATE=1],
488488
[OMPI_FORTRAN_HAVE_PRIVATE=0])])
489489

490-
OMPI_FORTRAN_HAVE_PROTECTED=0
491-
AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \
492-
test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
493-
[ # Does the compiler support "protected"
494-
OMPI_FORTRAN_CHECK_PROTECTED(
495-
[OMPI_FORTRAN_HAVE_PROTECTED=1],
496-
[OMPI_FORTRAN_HAVE_PROTECTED=0])])
497-
498490
OMPI_FORTRAN_HAVE_ABSTRACT=0
499491
AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \
500492
test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
@@ -754,12 +746,6 @@ end type test_mpi_handle],
754746
[$OMPI_FORTRAN_HAVE_PRIVATE],
755747
[For mpi-f08-types.f90 and ompi_info: whether the compiler supports the "private" keyword or not (used in MPI_Status)])
756748

757-
# For configure-fortran-output.h, mpi-f08-types.F90 (and ompi_info)
758-
AC_SUBST([OMPI_FORTRAN_HAVE_PROTECTED])
759-
AC_DEFINE_UNQUOTED([OMPI_FORTRAN_HAVE_PROTECTED],
760-
[$OMPI_FORTRAN_HAVE_PROTECTED],
761-
[For mpi-f08-types.f90 and .F90 and ompi_info: whether the compiler supports the "protected" keyword or not])
762-
763749
# For configure-fortran-output.h, mpi-f08-interfaces-callbacks.F90
764750
# (and ompi_info)
765751
AC_SUBST([OMPI_FORTRAN_HAVE_ABSTRACT])

ompi/mpi/fortran/configure-fortran-output-bottom.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,4 @@
3838
#define OMPI_PRIVATE
3939
#endif
4040
41-
! PROTECTED or not
42-
#if OMPI_FORTRAN_HAVE_PROTECTED
43-
#define OMPI_PROTECTED , PROTECTED
44-
#else
45-
#define OMPI_PROTECTED
46-
#endif
47-
4841
#endif

ompi/tools/ompi_info/param.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* All rights reserved.
1212
* Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved
1313
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
14-
* Copyright (c) 2014-2017 Research Organization for Information Science
15-
* and Technology (RIST). All rights reserved.
14+
* Copyright (c) 2014-2019 Research Organization for Information Science
15+
* and Technology (RIST). All rights reserved.
1616
* Copyright (c) 2015 Intel, Inc. All rights reserved
1717
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
1818
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
@@ -199,7 +199,6 @@ void ompi_info_do_config(bool want_all)
199199
fortran_have_bind_c_type_name = OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME ?
200200
"yes" : "no";
201201
fortran_have_private = OMPI_FORTRAN_HAVE_PRIVATE ? "yes" : "no";
202-
fortran_have_protected = OMPI_FORTRAN_HAVE_PROTECTED ? "yes" : "no";
203202
fortran_have_abstract = OMPI_FORTRAN_HAVE_ABSTRACT ? "yes" : "no";
204203
fortran_have_asynchronous = OMPI_FORTRAN_HAVE_ASYNCHRONOUS ? "yes" : "no";
205204
fortran_have_procedure = OMPI_FORTRAN_HAVE_PROCEDURE ? "yes" : "no";
@@ -443,9 +442,6 @@ void ompi_info_do_config(bool want_all)
443442
opal_info_out("Fort PRIVATE",
444443
"compiler:fortran:private",
445444
fortran_have_private);
446-
opal_info_out("Fort PROTECTED",
447-
"compiler:fortran:protected",
448-
fortran_have_protected);
449445
opal_info_out("Fort ABSTRACT",
450446
"compiler:fortran:abstract",
451447
fortran_have_abstract);

0 commit comments

Comments
 (0)