From ca757b033ff2aa41e513b93040e158de2efcfc9c Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Thu, 8 Mar 2001 11:29:22 -0500 Subject: [svn-r3559] Purpose: C++ compatibility fix Description: 'delete' is a reserved word in C++ Solution: Change structure member named 'delete' into 'del' Platforms tested: FreeBSD 4.2 (hawkwind) --- src/H5P.c | 6 +++--- src/H5Pprivate.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/H5P.c b/src/H5P.c index d9a55d3..61b4bfd 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -4079,7 +4079,7 @@ H5P_create_prop(const char *name, size_t size, void *def_value, void *value, prop->create=prp_create; prop->set=prp_set; prop->get=prp_get; - prop->delete=prp_delete; + prop->del=prp_delete; prop->close=prp_close; /* Reset the link to the next property */ @@ -6930,9 +6930,9 @@ static herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist"); /* Pass value to 'close' callback, if it exists */ - if(prop->delete!=NULL) { + if(prop->del!=NULL) { /* Call user's callback */ - if((*(prop->delete))(plist_id,name,prop->value)<0) + if((*(prop->del))(plist_id,name,prop->value)<0) HRETURN_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't close property value"); } /* end if */ diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index 7bd10c0..15e280e 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -49,7 +49,7 @@ typedef struct H5P_genprop_tag { void *def_value; /* Pointer to default value to pass along to create callback */ H5P_prp_set_func_t set; /* Function to call when a property value is set */ H5P_prp_get_func_t get; /* Function to call when a property value is retrieved */ - H5P_prp_delete_func_t delete; /* Function to call when a property is deleted */ + H5P_prp_delete_func_t del; /* Function to call when a property is deleted */ H5P_prp_close_func_t close; /* Function to call when a property is closed */ struct H5P_genprop_tag *next; /* Pointer to the next property in this list */ -- cgit v0.12