fortran/use-mpi-f08: remove unused references to OMPI_PROTECTED

Signed-off-by: Gilles Gouaillardet <[email protected]>

(back-ported from commit open-mpi/ompi@df6d763)

Author: ggouaillardet

config/ompi_setup_mpi_fortran.m4

@@ -15,8 +15,8 @@ dnl Copyright (c) 2006-2008 Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
-dnl Copyright (c) 2014-2017 Research Organization for Information Science
-dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2014-2019 Research Organization for Information Science
+dnl                         and Technology (RIST).  All rights reserved.
 dnl Copyright (c) 2016      IBM Corporation.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
@@ -743,8 +743,7 @@ end type test_mpi_handle],
                        [$OMPI_FORTRAN_HAVE_PRIVATE],
                        [For mpi-f08-types.f90 and ompi_info: whether the compiler supports the "private" keyword or not (used in MPI_Status)])
 
-    # For configure-fortran-output.h, mpi-f08-types.F90 (and ompi_info)
-    AC_SUBST([OMPI_FORTRAN_HAVE_PROTECTED])
+    # For ompi_info only
     AC_DEFINE_UNQUOTED([OMPI_FORTRAN_HAVE_PROTECTED],
                        [$OMPI_FORTRAN_HAVE_PROTECTED],
                        [For mpi-f08-types.f90 and .F90 and ompi_info: whether the compiler supports the "protected" keyword or not])

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

@@ -3,6 +3,8 @@
 ! Copyright (c) 2006-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
+! Copyright (c) 2019      Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 !
 ! $COPYRIGHT$
 !
@@ -38,11 +40,4 @@
 #define OMPI_PRIVATE
 #endif
 
-! PROTECTED or not
-#if OMPI_FORTRAN_HAVE_PROTECTED
-#define OMPI_PROTECTED , PROTECTED
-#else
-#define OMPI_PROTECTED
-#endif
-
 #endif

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

@@ -3,8 +3,8 @@
 ! Copyright (c) 2006-2014 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
-! Copyright (c) 2017-2018 Research Organization for Information Science
-!                         and Technology (RIST). All rights reserved.
+! Copyright (c) 2017-2019 Research Organization for Information Science
+!                         and Technology (RIST).  All rights reserved.
 !
 ! $COPYRIGHT$
 !
@@ -25,9 +25,6 @@
 ! Whether we have PRIVATE or not
 #define OMPI_FORTRAN_HAVE_PRIVATE @OMPI_FORTRAN_HAVE_PRIVATE@
 
-! Whether we have PROTECTED or not
-#define OMPI_FORTRAN_HAVE_PROTECTED @OMPI_FORTRAN_HAVE_PROTECTED@
-
 ! Whether we have ABSTRACT or not
 #define OMPI_FORTRAN_HAVE_ABSTRACT @OMPI_FORTRAN_HAVE_ABSTRACT@