8e1b23779f
#if defined (c_plusplus) defined (__cplusplus) followed by extern "C" { and the closing counterpart by BEGIN_C_DECLS and END_C_DECLS. Notable exceptions are: - opal/include/opal_config_bottom.h: This is our generated code, that itself defines BEGIN_C_DECL and END_C_DECL - ompi/mpi/cxx/mpicxx.h: Here we do not include opal_config_bottom.h: - Belongs to external code: opal/mca/backtrace/darwin/MoreBacktrace/MoreDebugging/MoreBacktrace.c opal/mca/backtrace/darwin/MoreBacktrace/MoreDebugging/MoreBacktrace.h - opal/include/opal/prefetch.h: Has C++ specific macros that are protected: - Had #if ... } #endif _and_ END_C_DECLS (aka end up with 2x END_C_DECLS) ompi/mca/btl/openib/btl_openib.h - opal/event/event.h has #ifdef __cplusplus as BEGIN_C_DECLS... - opal/win32/ompi_process.h: had extern "C"\n {... opal/win32/ompi_process.h: dito - ompi/mca/btl/pcie/btl_pcie_lex.l: needed to add *_C_DECLS ompi/mpi/f90/test/align_c.c: dito - ompi/debuggers/msgq_interface.h: used #ifdef __cplusplus - ompi/mpi/f90/xml/common-C.xsl: Amend Tested on linux using --with-openib and --with-mx The following do not contain either opal_config.h, orte_config.h or ompi_config.h (but possibly other header files, that include one of the above): ompi/mca/bml/r2/bml_r2_ft.h ompi/mca/btl/gm/btl_gm_endpoint.h ompi/mca/btl/gm/btl_gm_proc.h ompi/mca/btl/mx/btl_mx_endpoint.h ompi/mca/btl/ofud/btl_ofud_endpoint.h ompi/mca/btl/ofud/btl_ofud_frag.h ompi/mca/btl/ofud/btl_ofud_proc.h ompi/mca/btl/openib/btl_openib_mca.h ompi/mca/btl/portals/btl_portals_endpoint.h ompi/mca/btl/portals/btl_portals_frag.h ompi/mca/btl/sctp/btl_sctp_endpoint.h ompi/mca/btl/sctp/btl_sctp_proc.h ompi/mca/btl/tcp/btl_tcp_endpoint.h ompi/mca/btl/tcp/btl_tcp_ft.h ompi/mca/btl/tcp/btl_tcp_proc.h ompi/mca/btl/template/btl_template_endpoint.h ompi/mca/btl/template/btl_template_proc.h ompi/mca/btl/udapl/btl_udapl_eager_rdma.h ompi/mca/btl/udapl/btl_udapl_endpoint.h ompi/mca/btl/udapl/btl_udapl_mca.h ompi/mca/btl/udapl/btl_udapl_proc.h ompi/mca/mtl/mx/mtl_mx_endpoint.h ompi/mca/mtl/mx/mtl_mx.h ompi/mca/mtl/psm/mtl_psm_endpoint.h ompi/mca/mtl/psm/mtl_psm.h ompi/mca/pml/cm/pml_cm_component.h ompi/mca/pml/csum/pml_csum_comm.h ompi/mca/pml/dr/pml_dr_comm.h ompi/mca/pml/dr/pml_dr_component.h ompi/mca/pml/dr/pml_dr_endpoint.h ompi/mca/pml/dr/pml_dr_recvfrag.h ompi/mca/pml/example/pml_example.h ompi/mca/pml/ob1/pml_ob1_comm.h ompi/mca/pml/ob1/pml_ob1_component.h ompi/mca/pml/ob1/pml_ob1_endpoint.h ompi/mca/pml/ob1/pml_ob1_rdmafrag.h ompi/mca/pml/ob1/pml_ob1_recvfrag.h ompi/mca/pml/v/pml_v_output.h opal/include/opal/prefetch.h opal/mca/timer/aix/timer_aix.h opal/util/qsort.h test/support/components.h This commit was SVN r21855. The following SVN revision numbers were found above: r2 --> open-mpi/ompi@58fdc18855
38 строки
996 B
Bash
Исполняемый файл
38 строки
996 B
Bash
Исполняемый файл
#!/bin/sh
|
|
#
|
|
# Change all occurences of #if defined(c_plusplus) and variations
|
|
# to BEGIN_C_DECLS and END_C_DECLS using sed.
|
|
#
|
|
# List of files grepped are in XXX, sed script is in XXX
|
|
#
|
|
TMPDIR=${TMPDIR:-.}
|
|
|
|
while read LINE ; do
|
|
if test '#' = ${LINE:0:1} ; then
|
|
continue
|
|
fi
|
|
|
|
FILE=${LINE%%:*}
|
|
HAS_OPAL_CONFIG_H=0
|
|
HAS_ORTE_CONFIG_H=0
|
|
HAS_OMPI_CONFIG_H=0
|
|
grep -q "#include \"opal_config.h\"" $FILE && HAS_OPAL_CONFIG_H=1
|
|
grep -q "#include \"orte_config.h\"" $FILE && HAS_ORTE_CONFIG_H=1
|
|
grep -q "#include \"ompi_config.h\"" $FILE && HAS_OMPI_CONFIG_H=1
|
|
|
|
if test $HAS_OPAL_CONFIG_H -eq 0 -a \
|
|
$HAS_ORTE_CONFIG_H -eq 0 -a \
|
|
$HAS_OMPI_CONFIG_H -eq 0 ; then
|
|
echo $FILE contains neither header
|
|
fi
|
|
sed -f contrib/ompi_cplusplus.sed $FILE > $TMPDIR/tmp_file.tmp
|
|
mv $TMPDIR/tmp_file.tmp $FILE
|
|
|
|
|
|
#
|
|
# Sanity check
|
|
#
|
|
# grep -h -c BEGIN_C_DECLS $FILE | grep -v ':1$'
|
|
# grep -h -c END_C_DECLS $FILE | grep -v ':1$'
|
|
done < contrib/ompi_cplusplus.txt
|