summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-01-11 16:52:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-01-11 16:52:16 (GMT)
commit19d1f30101d67a007a7b210f9aeafe35c0ae90e2 (patch)
treedd29d5d797679728e9604dcdcd67f037e4ecb543
parentb885b7ddcf7e560513044dcb796a68057479c691 (diff)
downloadhdf5-19d1f30101d67a007a7b210f9aeafe35c0ae90e2.zip
hdf5-19d1f30101d67a007a7b210f9aeafe35c0ae90e2.tar.gz
hdf5-19d1f30101d67a007a7b210f9aeafe35c0ae90e2.tar.bz2
[svn-r3268] Purpose:
Code cleanup for C++ Description: 'xor' is a keyword in C++, causing problems compiling the library with a C++ compiler. Solution: Change variables and structure fields from 'xor' to 'xor_val' Platforms tested: FreeBSD 4.2 (hawkwind)
-rw-r--r--src/H5P.c8
-rw-r--r--src/H5Pprivate.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/H5P.c b/src/H5P.c
index 5682153..6496363 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -4051,7 +4051,7 @@ H5P_create_prop(const char *name, size_t size, void *def_value, void *value,
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
/* Set the property initial values */
- prop->xor = H5P_xor_name(name); /* Generate the XOR'd value for the name */
+ prop->xor_val = H5P_xor_name(name); /* Generate the XOR'd value for the name */
prop->name = HDstrdup(name); /* Duplicate name */
prop->size=size;
/* Duplicate value, if it exists */
@@ -4173,7 +4173,7 @@ H5P_find_prop(H5P_genprop_t *hash[], uintn hashsize, const char *name)
{
H5P_genprop_t *ret_value; /* Property pointer return value */
uintn loc; /* Hash table location */
- uintn xor; /* XOR'ed value of the name to look for */
+ uintn xor_val; /* XOR'ed value of the name to look for */
FUNC_ENTER (H5P_add_prop, NULL);
@@ -4185,13 +4185,13 @@ H5P_find_prop(H5P_genprop_t *hash[], uintn hashsize, const char *name)
loc=H5P_hash_name(name,hashsize);
/* Get the XOR'ed value for the name to search for, to speed up comparisons */
- xor=H5P_xor_name(name);
+ xor_val=H5P_xor_name(name);
/* Locate property in list */
ret_value=hash[loc];
while(ret_value!=NULL) {
/* Check for name matching */
- if(ret_value->xor==xor && HDstrcmp(ret_value->name,name)==0)
+ if(ret_value->xor_val==xor_val && HDstrcmp(ret_value->name,name)==0)
break;
} /* end while */
diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index 646b5d5..e46dad2 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -39,7 +39,7 @@ typedef enum {
/* Define structure to hold property information */
typedef struct H5P_genprop_tag {
/* Values for this property */
- uintn xor; /* XOR'ed version of the name, for faster comparisons */
+ uintn xor_val; /* XOR'ed version of the name, for faster comparisons */
char *name; /* Name of property */
size_t size; /* Size of property value */
void *value; /* Pointer to property value */