[svn-r7060] Purpose:

    Code cleanup

Description:
    Change some variables that are keywords in C++ to non-keywords.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    too minor to require full h5committest

2 files changed, 3 insertions, 3 deletions

diff --git a/src/H5O.c b/src/H5O.c
index 21a9b36..5144220 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -3173,7 +3173,7 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
 	type = curr_msg->type;
 
         /* Check if there is a file space deletion callback for this type of message */
-        if(type->delete) {
+        if(type->del) {
             /*
              * Decode the message if necessary.
              */
@@ -3184,7 +3184,7 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "unable to decode message");
             } /* end if */
 
-            if ((type->delete)(f, dxpl_id, curr_msg->native)<0)
+            if ((type->del)(f, dxpl_id, curr_msg->native)<0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message");
         } /* end if */
     } /* end for */
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index ceb4ae3..1255764 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -66,7 +66,7 @@ typedef struct H5O_class_t {
     size_t	(*raw_size)(H5F_t*, const void*);/*sizeof raw val	     */
     herr_t	(*reset)(void *);		 /*free nested data structs  */
     herr_t	(*free)(void *);		 /*free main data struct  */
-    herr_t	(*delete)(H5F_t *, hid_t, const void *); /* Delete space in file referenced by this message */
+    herr_t	(*del)(H5F_t *, hid_t, const void *); /* Delete space in file referenced by this message */
     herr_t	(*get_share)(H5F_t*, const void*, struct H5O_shared_t*);    /* Get shared information */
     herr_t	(*set_share)(H5F_t*, void*, const struct H5O_shared_t*);    /* Set shared information */
     herr_t	(*debug)(H5F_t*, hid_t, const void*, FILE*, int, int);