From d86d15a15c1e1b4521b86f1551ee0c3dd96f7d12 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 22 Oct 2009 18:02:48 +0000
Subject: [PATCH] Refs trac:2067: also update the F90 references to
 *_errhandler_fn (this XML code in the F90 tree isn't used anymore, but we
 might as well update it just so that everything is consistent).

This commit was SVN r22127.

The following Trac tickets were found above:
  Ticket 2067 --> https://svn.open-mpi.org/trac/ompi/ticket/2067
---
 ompi/mpi/f90/xml/chasm-mpi-test.f90.xsl | 13 +++++++------
 ompi/mpi/f90/xml/chasm-mpi.i.f90.xsl    | 14 +++++++-------
 ompi/mpi/f90/xml/mpi.h.xml              | 13 +++++++------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ompi/mpi/f90/xml/chasm-mpi-test.f90.xsl b/ompi/mpi/f90/xml/chasm-mpi-test.f90.xsl
index 396624f09c..90fd8575a2 100644
--- a/ompi/mpi/f90/xml/chasm-mpi-test.f90.xsl
+++ b/ompi/mpi/f90/xml/chasm-mpi-test.f90.xsl
@@ -2,6 +2,7 @@
  ...........................................................................
  Copyright (c) 2004-2006 The Regents of the University of California.
                          All rights reserved.
+ Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
  $COPYRIGHT$
  
  Additional copyrights may follow
@@ -288,7 +289,7 @@ echo
         <xsl:when test="@usertype = 'MPI_Status'">
           <xsl:text>integer, dimension(MPI_STATUS_SIZE)</xsl:text>
         </xsl:when>
-        <xsl:when test="@usertype = 'MPI_Comm_errhandler_fn'">
+        <xsl:when test="@usertype = 'MPI_Comm_errhandler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
         <xsl:when test="@usertype = 'MPI_Comm_copy_attr_function'">
@@ -300,7 +301,7 @@ echo
         <xsl:when test="@usertype = 'MPI_Handler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
-        <xsl:when test="@usertype = 'MPI_File_errhandler_fn'">
+        <xsl:when test="@usertype = 'MPI_File_errhandler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
         <xsl:when test="@usertype = 'MPI_Grequest_query_function'">
@@ -333,7 +334,7 @@ echo
         <xsl:when test="@usertype = 'MPI_Type_delete_attr_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
-        <xsl:when test="@usertype = 'MPI_Win_errhandler_fn'">
+        <xsl:when test="@usertype = 'MPI_Win_errhandler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
         <xsl:when test="@usertype = 'MPI_Win_copy_attr_function'">
@@ -454,11 +455,11 @@ echo
         <xsl:when test="@usertype = 'MPI_Status'">
           <xsl:text> = STATUS_VAL</xsl:text>
         </xsl:when>
-        <xsl:when test="@usertype = 'MPI_Comm_errhandler_fn'"/>
+        <xsl:when test="@usertype = 'MPI_Comm_errhandler_function'"/>
         <xsl:when test="@usertype = 'MPI_Comm_copy_attr_function'"/>
         <xsl:when test="@usertype = 'MPI_Comm_delete_attr_function'"/>
         <xsl:when test="@usertype = 'MPI_Handler_function'"/>
-        <xsl:when test="@usertype = 'MPI_File_errhandler_fn'"/>
+        <xsl:when test="@usertype = 'MPI_File_errhandler_function'"/>
         <xsl:when test="@usertype = 'MPI_Grequest_query_function'"/>
         <xsl:when test="@usertype = 'MPI_Grequest_free_function'"/>
         <xsl:when test="@usertype = 'MPI_Grequest_cancel_function'"/>
@@ -469,7 +470,7 @@ echo
         <xsl:when test="@usertype = 'MPI_Datarep_extent_function'"/>
         <xsl:when test="@usertype = 'MPI_Type_copy_attr_function'"/>
         <xsl:when test="@usertype = 'MPI_Type_delete_attr_function'"/>
-        <xsl:when test="@usertype = 'MPI_Win_errhandler_fn'"/>
+        <xsl:when test="@usertype = 'MPI_Win_errhandler_function'"/>
         <xsl:when test="@usertype = 'MPI_Win_copy_attr_function'"/>
         <xsl:when test="@usertype = 'MPI_Win_delete_attr_function'"/>
         <xsl:otherwise>
diff --git a/ompi/mpi/f90/xml/chasm-mpi.i.f90.xsl b/ompi/mpi/f90/xml/chasm-mpi.i.f90.xsl
index 4a369939ef..faf141dd2b 100644
--- a/ompi/mpi/f90/xml/chasm-mpi.i.f90.xsl
+++ b/ompi/mpi/f90/xml/chasm-mpi.i.f90.xsl
@@ -2,7 +2,7 @@
  ...........................................................................
  Copyright (c) 2004-2006 The Regents of the University of California.
                          All rights reserved.
- Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
  $COPYRIGHT$
  
  Additional copyrights may follow
@@ -382,7 +382,7 @@ end </xsl:text>
     <xsl:when test="@kind = 'ptr'">
       <xsl:choose>
         <xsl:when
-             test="indirect/type/@usertype='MPI_Comm_errhandler_fn'"/>
+             test="indirect/type/@usertype='MPI_Comm_errhandler_function'"/>
         <xsl:when
              test="indirect/type/@usertype='MPI_Comm_copy_attr_function'"/>
         <xsl:when
@@ -390,7 +390,7 @@ end </xsl:text>
         <xsl:when
              test="indirect/type/@usertype='MPI_Handler_function'"/>
         <xsl:when
-             test="indirect/type/@usertype='MPI_File_errhandler_fn'"/>
+             test="indirect/type/@usertype='MPI_File_errhandler_function'"/>
         <xsl:when
              test="indirect/type/@usertype='MPI_Grequest_query_function'"/>
         <xsl:when
@@ -412,7 +412,7 @@ end </xsl:text>
         <xsl:when
              test="indirect/type/@usertype='MPI_Type_delete_attr_function'"/>
         <xsl:when
-             test="indirect/type/@usertype='MPI_Win_errhandler_fn'"/>
+             test="indirect/type/@usertype='MPI_Win_errhandler_function'"/>
         <xsl:when
              test="indirect/type/@usertype='MPI_Win_copy_attr_function'"/>
         <xsl:when
@@ -527,7 +527,7 @@ end </xsl:text>
         <xsl:when test="@usertype = 'MPI_Status'">
           <xsl:text>integer, dimension(MPI_STATUS_SIZE)</xsl:text>
         </xsl:when>
-        <xsl:when test="@usertype = 'MPI_Comm_errhandler_fn'">
+        <xsl:when test="@usertype = 'MPI_Comm_errhandler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
         <xsl:when test="@usertype = 'MPI_Comm_copy_attr_function'">
@@ -539,7 +539,7 @@ end </xsl:text>
         <xsl:when test="@usertype = 'MPI_Handler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
-        <xsl:when test="@usertype = 'MPI_File_errhandler_fn'">
+        <xsl:when test="@usertype = 'MPI_File_errhandler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
         <xsl:when test="@usertype = 'MPI_Grequest_query_function'">
@@ -572,7 +572,7 @@ end </xsl:text>
         <xsl:when test="@usertype = 'MPI_Type_delete_attr_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
-        <xsl:when test="@usertype = 'MPI_Win_errhandler_fn'">
+        <xsl:when test="@usertype = 'MPI_Win_errhandler_function'">
           <xsl:text>external</xsl:text>
         </xsl:when>
         <xsl:when test="@usertype = 'MPI_Win_copy_attr_function'">
diff --git a/ompi/mpi/f90/xml/mpi.h.xml b/ompi/mpi/f90/xml/mpi.h.xml
index b0f2595e9a..5cd641a636 100644
--- a/ompi/mpi/f90/xml/mpi.h.xml
+++ b/ompi/mpi/f90/xml/mpi.h.xml
@@ -10,6 +10,7 @@
                          University of Stuttgart.  All rights reserved.
  Copyright (c) 2004-2005 The Regents of the University of California.
                          All rights reserved.
+ Copyrgiht (c) 2009      All rights reserved.
  $COPYRIGHT$
  
  Additional copyrights may follow
@@ -1539,7 +1540,7 @@
     </method>
     
     <!-- 
-      -  METHOD: int MPI_Comm_create_errhandler(MPI_Comm_errhandler_fn *, MPI_Errhandler *) C
+      -  METHOD: int MPI_Comm_create_errhandler(MPI_Comm_errhandler_function *, MPI_Errhandler *) C
       - NOTE: First parameter is an external function
       -->
     <method name="MPI_Comm_create_errhandler" kind="final">
@@ -1548,7 +1549,7 @@
       <arg name="function" intent="in">
         <type kind="ptr" >
           <indirect depth="1" kind="pointer">
-            <type kind="usertype" usertype="MPI_Comm_errhandler_fn" >
+            <type kind="usertype" usertype="MPI_Comm_errhandler_function" >
             </type>
           </indirect>
         </type>
@@ -2456,7 +2457,7 @@
     </method>
     
     <!-- 
-      -  METHOD: int MPI_File_create_errhandler(MPI_File_errhandler_fn *, MPI_Errhandler *) C
+      -  METHOD: int MPI_File_create_errhandler(MPI_File_errhandler_function *, MPI_Errhandler *) C
       - NOTE: First parameter is an external function
       -->
     <method name="MPI_File_create_errhandler" kind="final">
@@ -2465,7 +2466,7 @@
       <arg name="function" intent="in">
         <type kind="ptr" >
           <indirect depth="1" kind="pointer">
-            <type kind="usertype" usertype="MPI_File_errhandler_fn" >
+            <type kind="usertype" usertype="MPI_File_errhandler_function" >
             </type>
           </indirect>
         </type>
@@ -10608,7 +10609,7 @@
     </method>
     
     <!-- 
-      -  METHOD: int MPI_Win_create_errhandler(MPI_Win_errhandler_fn *, MPI_Errhandler *) C
+      -  METHOD: int MPI_Win_create_errhandler(MPI_Win_errhandler_function *, MPI_Errhandler *) C
       - NOTE: First parameter is an external function
       -->
     <method name="MPI_Win_create_errhandler" kind="final">
@@ -10617,7 +10618,7 @@
       <arg name="function" intent="in">
         <type kind="ptr" >
           <indirect depth="1" kind="pointer">
-            <type kind="usertype" usertype="MPI_Win_errhandler_fn" >
+            <type kind="usertype" usertype="MPI_Win_errhandler_function" >
             </type>
           </indirect>
         </type>