diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2003-04-29 19:49:48 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2003-04-29 19:49:48 (GMT) |
| commit | b58192dfe739118385748c776e8a99c16b82bb03 (patch) | |
| tree | d2b3181ef6e49db6359eb715b08a1b7b4a81eb8a /src/H5Gpublic.h | |
| parent | 67985f540fe44d0ea57415dd10a592259a25d154 (diff) | |
| download | hdf5-b58192dfe739118385748c776e8a99c16b82bb03.zip hdf5-b58192dfe739118385748c776e8a99c16b82bb03.tar.gz hdf5-b58192dfe739118385748c776e8a99c16b82bb03.tar.bz2 | |
[svn-r6779] Purpose: Backward compatibility change
Description: 1.4 compatibility for H5G_obj_t type and H5Zregister test.
Solution: use macro H5_WANT_H5_V1_4_COMPAT
Platforms tested: h5committest
Diffstat (limited to 'src/H5Gpublic.h')
| -rw-r--r-- | src/H5Gpublic.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 88b6c45..5a48e30 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -52,6 +52,17 @@ typedef enum H5G_link_t { * application is running. An object may satisfy the `isa' function for more * than one type. */ +#ifdef H5_WANT_H5_V1_4_COMPAT +#define H5G_UNKNOWN -1 /* Unknown object type */ +#define H5G_LINK 0 /* Object is a symbolic link */ +#define H5G_GROUP 1 /* Object is a group */ +#define H5G_DATASET 2 /* Object is a dataset */ +#define H5G_TYPE 3 /* Object is a named data type */ +#define H5G_RESERVED_4 4 /* Reserved for future use */ +#define H5G_RESERVED_5 5 /* Reserved for future use */ +#define H5G_RESERVED_6 6 /* Reserved for future use */ +#define H5G_RESERVED_7 7 /* Reserved for future use */ +#else /*H5_WANT_H5_V1_4_COMPAT*/ typedef enum H5G_obj_t { H5G_UNKNOWN = -1, /* Unknown object type */ H5G_LINK, /* Object is a symbolic link */ @@ -63,6 +74,7 @@ typedef enum H5G_obj_t { H5G_RESERVED_6, /* Reserved for future use */ H5G_RESERVED_7 /* Reserved for future use */ } H5G_obj_t; +#endif /*H5_WANT_H5_V1_4_COMPAT*/ #define H5G_NTYPES 256 /* Max possible number of types */ #define H5G_NLIBTYPES 8 /* Number of internal types */ @@ -74,7 +86,11 @@ typedef struct H5G_stat_t { unsigned long fileno[2]; /*file number */ unsigned long objno[2]; /*object number */ unsigned nlink; /*number of hard links to object*/ +#ifdef H5_WANT_H5_V1_4_COMPAT + int type; /*basic object type */ +#else /*H5_WANT_H5_V1_4_COMPAT*/ H5G_obj_t type; /*basic object type */ +#endif /*H5_WANT_H5_V1_4_COMPAT*/ time_t mtime; /*modification time */ size_t linklen; /*symbolic link value length */ } H5G_stat_t; @@ -95,7 +111,11 @@ H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx, H5G_iterate_t op, void *op_data); H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs); H5_DLL ssize_t H5Gget_objname_by_idx(hid_t group_id, hsize_t idx, char* name, size_t size); +#ifdef H5_WANT_H5_V1_4_COMPAT +H5_DLL int H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx); +#else /*H5_WANT_H5_V1_4_COMPAT*/ H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx); +#endif /*H5_WANT_H5_V1_4_COMPAT*/ H5_DLL herr_t H5Gmove2(hid_t src_loc, const char *src, hid_t dst_loc, const char *dst); H5_DLL herr_t H5Glink2(hid_t src_loc, const char *cur_name, H5G_link_t type, |