Skip to content

Commit 12d81b5

Browse files
committed
ifx: tweaks for the compilers preprocessor
ifx preprocess treats '!'s as if they are comments even at the preprocess level so we need to make sure any defines to be used in the preprocessor stage to not include '!'s in them. Signed-off-by: Howard Pritchard <hppritcha@gmail.com>
1 parent 4a195dd commit 12d81b5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config/ompi_setup_mpi_fortran.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -899,11 +899,11 @@ end type test_mpi_handle],
899899

900900
AS_IF([test $OMPI_FORTRAN_HAVE_TS -eq 1],
901901
[OMPI_F08_IGNORE_TKR_TYPE="type(*), dimension(..)"
902-
OMPI_F08_IGNORE_TKR_PREDECL="! no attribute required for"
902+
OMPI_F08_IGNORE_TKR_PREDECL="no attribute required for"
903903
OMPI_F08_BINDINGS_EXTENSION="ts"
904904
OMPI_F08_BINDINGS_TS_SUFFIX="ts"],
905905
[OMPI_F08_IGNORE_TKR_TYPE=$OMPI_FORTRAN_IGNORE_TKR_TYPE
906-
OMPI_F08_IGNORE_TKR_PREDECL=$OMPI_FORTRAN_IGNORE_TKR_PREDECL
906+
OMPI_F08_IGNORE_TKR_PREDECL=${OMPI_FORTRAN_IGNORE_TKR_PREDECL:1}
907907
OMPI_F08_BINDINGS_EXTENSION="f"
908908
OMPI_F08_BINDINGS_TS_SUFFIX=""])
909909
AC_SUBST(OMPI_F08_BINDINGS_EXTENSION)

ompi/mpi/bindings/ompi_bindings/fortran_type.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def validate_dep_param_keys(param_name, keys):
147147
util.validate_allowed_keys(keys, ['count', 'type', 'comm'], 'BUFFER', param_name)
148148

149149
def interface_predeclare(self):
150-
return f'OMPI_F08_IGNORE_TKR_PREDECL {self.name}'
150+
return f'!OMPI_F08_IGNORE_TKR_PREDECL {self.name}'
151151

152152
def declare(self):
153153
return f'OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: {self.name}'

0 commit comments

Comments
 (0)