Skip to content

Commit a0fb112

Browse files
hppritchahppritcha
authored
Merge pull request #3674 from ggouaillardet/topic/v2.x/fortran_strings
v2.1.x: fortran/base: rename strings.h into fortran_base_strings.h
2 parents 3ba4dce + 6775f8c commit a0fb112

36 files changed

+73
-69
lines changed

‎ompi/mpi/fortran/base/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
13-
# Copyright (c) 2015 Research Organization for Information Science
13+
# Copyright (c) 2015-2017 Research Organization for Information Science
1414
# and Technology (RIST). All rights reserved.
1515
# $COPYRIGHT$
1616
#
@@ -45,7 +45,7 @@ libmpi_fortran_base_la_SOURCES = \
4545
constants.h \
4646
datarep.h \
4747
fint_2_int.h \
48-
strings.h \
48+
fortran_base_strings.h \
4949
attr_fn_f.c \
5050
conversion_fn_null_f.c \
5151
f90_accessors.c \

‎ompi/mpi/fortran/base/strings.h renamed to ‎ompi/mpi/fortran/base/fortran_base_strings.h

File renamed without changes.

‎ompi/mpi/fortran/base/strings.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2017 Research Organization for Information Science
14+
* and Technology (RIST). All rights reserved.
1315
* $COPYRIGHT$
1416
*
1517
* Additional copyrights may follow
@@ -25,7 +27,7 @@
2527

2628
#include "ompi/constants.h"
2729
#include "opal/util/argv.h"
28-
#include "ompi/mpi/fortran/base/strings.h"
30+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2931

3032

3133
/*

‎ompi/mpi/fortran/mpif-h/add_error_string_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -23,7 +23,7 @@
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/mpi/fortran/base/constants.h"
26-
#include "ompi/mpi/fortran/base/strings.h"
26+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2727
#include "ompi/communicator/communicator.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING

‎ompi/mpi/fortran/mpif-h/close_port_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626

2727
#if OMPI_BUILD_MPI_PROFILING
2828
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/comm_accept_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626

2727
#if OMPI_BUILD_MPI_PROFILING
2828
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/comm_connect_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626

2727
#if OMPI_BUILD_MPI_PROFILING
2828
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/comm_get_name_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626
#include "ompi/constants.h"
2727
#include "ompi/communicator/communicator.h"
2828

‎ompi/mpi/fortran/mpif-h/comm_set_name_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -24,7 +24,7 @@
2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/constants.h"
2626
#include "ompi/communicator/communicator.h"
27-
#include "ompi/mpi/fortran/base/strings.h"
27+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING
3030
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/comm_spawn_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -23,7 +23,7 @@
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/mpi/fortran/base/constants.h"
26-
#include "ompi/mpi/fortran/base/strings.h"
26+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2727
#include "opal/util/argv.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING

‎ompi/mpi/fortran/mpif-h/comm_spawn_multiple_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1616
* reserved.
@@ -25,7 +25,7 @@
2525

2626
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2727
#include "ompi/mpi/fortran/base/constants.h"
28-
#include "ompi/mpi/fortran/base/strings.h"
28+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2929
#include "opal/util/argv.h"
3030

3131

‎ompi/mpi/fortran/mpif-h/error_string_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626
#include "ompi/constants.h"
2727
#include "ompi/communicator/communicator.h"
2828

‎ompi/mpi/fortran/mpif-h/file_delete_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626
#include "ompi/file/file.h"
2727

2828
#if OMPI_BUILD_MPI_PROFILING

‎ompi/mpi/fortran/mpif-h/file_get_view_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626
#include "ompi/file/file.h"
2727

2828
#if OMPI_BUILD_MPI_PROFILING

‎ompi/mpi/fortran/mpif-h/file_open_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626
#include "ompi/file/file.h"
2727

2828
#if OMPI_BUILD_MPI_PROFILING

‎ompi/mpi/fortran/mpif-h/file_set_view_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626
#include "ompi/file/file.h"
2727

2828
#if OMPI_BUILD_MPI_PROFILING

‎ompi/mpi/fortran/mpif-h/get_library_version_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -22,7 +22,7 @@
2222
#include "ompi_config.h"
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
25-
#include "ompi/mpi/fortran/base/strings.h"
25+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2626

2727
#if OMPI_BUILD_MPI_PROFILING
2828
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/get_processor_name_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -24,7 +24,7 @@
2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/constants.h"
2626
#include "ompi/communicator/communicator.h"
27-
#include "ompi/mpi/fortran/base/strings.h"
27+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING
3030
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/info_delete_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -24,7 +24,7 @@
2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/constants.h"
2626
#include "ompi/communicator/communicator.h"
27-
#include "ompi/mpi/fortran/base/strings.h"
27+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING
3030
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/info_get_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -24,7 +24,7 @@
2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/constants.h"
2626
#include "ompi/communicator/communicator.h"
27-
#include "ompi/mpi/fortran/base/strings.h"
27+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING
3030
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/info_get_nthkey_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -24,7 +24,7 @@
2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/constants.h"
2626
#include "ompi/communicator/communicator.h"
27-
#include "ompi/mpi/fortran/base/strings.h"
27+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING
3030
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/info_get_valuelen_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -24,7 +24,7 @@
2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/constants.h"
2626
#include "ompi/communicator/communicator.h"
27-
#include "ompi/mpi/fortran/base/strings.h"
27+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING
3030
#if OPAL_HAVE_WEAK_SYMBOLS

‎ompi/mpi/fortran/mpif-h/info_set_f.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015 Research Organization for Information Science
13+
* Copyright (c) 2015-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
@@ -24,7 +24,7 @@
2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/constants.h"
2626
#include "ompi/communicator/communicator.h"
27-
#include "ompi/mpi/fortran/base/strings.h"
27+
#include "ompi/mpi/fortran/base/fortran_base_strings.h"
2828

2929
#if OMPI_BUILD_MPI_PROFILING
3030
#if OPAL_HAVE_WEAK_SYMBOLS

0 commit comments

Comments
 (0)