diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Tdeprec.c | 8 | ||||
| -rw-r--r-- | src/H5Tpublic.h | 8 | ||||
| -rw-r--r-- | src/H5vers.txt | 1 | ||||
| -rw-r--r-- | src/H5version.h | 15 |
4 files changed, 21 insertions, 11 deletions
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c index 8dbcc4a..6b30c55 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -148,7 +148,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5Topen + * Function: H5Topen1 * * Purpose: Opens a named datatype. * @@ -164,7 +164,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5Topen(hid_t loc_id, const char *name) +H5Topen1(hid_t loc_id, const char *name) { H5T_t *type = NULL; H5G_loc_t loc; @@ -176,7 +176,7 @@ H5Topen(hid_t loc_id, const char *name) hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datatype */ hid_t ret_value = FAIL; - FUNC_ENTER_API(H5Topen, FAIL) + FUNC_ENTER_API(H5Topen1, FAIL) H5TRACE2("i", "i*s", loc_id, name); /* Check args */ @@ -223,5 +223,5 @@ done: } /* end if */ FUNC_LEAVE_API(ret_value) -} /* end H5Topen() */ +} /* end H5Topen1() */ diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index fbdcba8..97862b5 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -592,13 +592,6 @@ H5_DLL htri_t H5Tcompiler_conv(hid_t src_id, hid_t dst_id); H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background, hid_t plist_id); -/* Functions and variables defined for compatibility with previous versions - * of the HDF5 API. - * - * Use of these functions and variables is deprecated. - */ -H5_DLL hid_t H5Topen(hid_t loc_id, const char *name); - /* Symbols defined for compatibility with previous versions of the HDF5 API. * * Use of these symbols is deprecated. @@ -613,6 +606,7 @@ H5_DLL hid_t H5Topen(hid_t loc_id, const char *name); /* Function prototypes */ H5_DLL herr_t H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id); +H5_DLL hid_t H5Topen1(hid_t loc_id, const char *name); #endif /* H5_NO_DEPRECATED_SYMBOLS */ diff --git a/src/H5vers.txt b/src/H5vers.txt index 6d8e732..ec7910d 100644 --- a/src/H5vers.txt +++ b/src/H5vers.txt @@ -55,6 +55,7 @@ FUNCTION: H5Gcreate; ; v10, v18 FUNCTION: H5Gopen; ; v10, v18 FUNCTION: H5Rget_obj_type; ; v16, v18 FUNCTION: H5Tcommit; ; v10, v18 +FUNCTION: H5Topen; ; v10, v18 # API typedefs # (although not required, it's easier to compare this file with the headers diff --git a/src/H5version.h b/src/H5version.h index 818b699..a1418f4 100644 --- a/src/H5version.h +++ b/src/H5version.h @@ -78,6 +78,10 @@ #define H5Tcommit_vers 1 #endif /* !defined(H5Tcommit_vers) */ +#if !defined(H5Topen_vers) +#define H5Topen_vers 1 +#endif /* !defined(H5Topen_vers) */ + /************/ /* Typedefs */ /************/ @@ -213,6 +217,17 @@ #error "H5Tcommit_vers set to invalid value" #endif /* H5Tcommit_vers */ +#if !defined(H5Topen_vers) || H5Topen_vers == 2 +#ifndef H5Topen_vers +#define H5Topen_vers 2 +#endif /* H5Topen_vers */ +#define H5Topen H5Topen2 +#elif H5Topen_vers == 1 +#define H5Topen H5Topen1 +#else /* H5Topen_vers */ +#error "H5Topen_vers set to invalid value" +#endif /* H5Topen_vers */ + /************/ /* Typedefs */ /************/ |