summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/lt_vers.am4
-rw-r--r--src/H5T.c22
-rw-r--r--src/H5Tprivate.h2
-rw-r--r--src/H5Tpublic.h2
-rw-r--r--test/dt_arith.c12
5 files changed, 21 insertions, 21 deletions
diff --git a/config/lt_vers.am b/config/lt_vers.am
index dc24c5f..b89ebd8 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -1,7 +1,7 @@
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
-LT_VERS_INTERFACE = 2
-LT_VERS_REVISION = 4
+LT_VERS_INTERFACE = 3
+LT_VERS_REVISION = 0
LT_VERS_AGE = 2
## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/src/H5T.c b/src/H5T.c
index f67ed7f..ce29ebb 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -2655,12 +2655,12 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5Tis_hard
+ * Function: H5Tcompiler_conv
*
* Purpose: Finds out whether the library's conversion function from
- * type src_id to type dst_id is a hard conversion. A hard
- * conversion uses compiler's casting; a soft conversion uses
- * the library's own conversion function.
+ * type src_id to type dst_id is a compiler (hard) conversion.
+ * A hard conversion uses compiler's casting; a soft conversion
+ * uses the library's own conversion function.
*
* Return: TRUE: hard conversion.
* FALSE: soft conversion.
@@ -2674,12 +2674,12 @@ done:
*-------------------------------------------------------------------------
*/
htri_t
-H5Tis_hard(hid_t src_id, hid_t dst_id)
+H5Tcompiler_conv(hid_t src_id, hid_t dst_id)
{
htri_t ret_value;
H5T_t *src = NULL, *dst = NULL;
- FUNC_ENTER_API(H5Tis_hard, FAIL);
+ FUNC_ENTER_API(H5Tcompiler_conv, FAIL);
/* Check args */
if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
@@ -2687,7 +2687,7 @@ H5Tis_hard(hid_t src_id, hid_t dst_id)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
/* Find it */
- if((ret_value=H5T_is_hard(src, dst))<0)
+ if((ret_value=H5T_compiler_conv(src, dst))<0)
HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found");
done:
@@ -4638,9 +4638,9 @@ H5T_path_bkg(const H5T_path_t *p)
/*-------------------------------------------------------------------------
- * Function: H5T_is_hard
+ * Function: H5T_compiler_conv
*
- * Purpose: Private function for H5Tis_hard. Finds out whether the
+ * Purpose: Private function for H5Tcompiler_conv. Finds out whether the
* library's conversion function from type SRC to type DST
* is a hard conversion.
*
@@ -4656,12 +4656,12 @@ H5T_path_bkg(const H5T_path_t *p)
*-------------------------------------------------------------------------
*/
htri_t
-H5T_is_hard(H5T_t *src, H5T_t *dst)
+H5T_compiler_conv(H5T_t *src, H5T_t *dst)
{
htri_t ret_value;
H5T_path_t *path = NULL;
- FUNC_ENTER_NOAPI(H5T_is_hard, FAIL);
+ FUNC_ENTER_NOAPI(H5T_compiler_conv, FAIL);
/* Find it */
if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id)))
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index a93ca84..1b6cb05 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -75,7 +75,7 @@ H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt, htri_t internal);
H5_DLL htri_t H5T_detect_class (const H5T_t *dt, H5T_class_t cls);
H5_DLL size_t H5T_get_size(const H5T_t *dt);
H5_DLL int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset);
-H5_DLL htri_t H5T_is_hard(H5T_t *src, H5T_t *dst);
+H5_DLL htri_t H5T_compiler_conv(H5T_t *src, H5T_t *dst);
H5_DLL herr_t H5T_debug(const H5T_t *dt, FILE * stream);
H5_DLL H5G_entry_t *H5T_entof(H5T_t *dt);
H5_DLL htri_t H5T_is_immutable(const H5T_t *dt);
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index be35e5e..d8ce90d 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -576,7 +576,7 @@ H5_DLL herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id,
H5_DLL herr_t H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id,
hid_t dst_id, H5T_conv_t func);
H5_DLL H5T_conv_t H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata);
-H5_DLL htri_t H5Tis_hard(hid_t src_id, hid_t dst_id);
+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);
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 7b025a5..c9af208 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -581,7 +581,7 @@ generates_sigfpe(void)
/*-------------------------------------------------------------------------
* Function: test_hard_query
*
- * Purpose: Tests H5Tis_hard() for querying whether a conversion is
+ * Purpose: Tests H5Tcompiler_conv() for querying whether a conversion is
* a hard one.
*
* Return: Success: 0
@@ -600,10 +600,10 @@ test_hard_query(void)
{
htri_t ret;
- TESTING("query functions of hard conversion");
+ TESTING("query functions of compiler conversion");
/* Verify the conversion from int to float is a hard conversion. */
- if((ret = H5Tis_hard(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=TRUE) {
+ if((ret = H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=TRUE) {
H5_FAILED();
printf("Can't query conversion function\n");
goto error;
@@ -612,7 +612,7 @@ test_hard_query(void)
/* Unregister the hard conversion from int to float. Verify the conversion
* is a soft conversion. */
H5Tunregister(H5T_PERS_HARD, NULL, H5T_NATIVE_INT, H5T_NATIVE_FLOAT, NULL);
- if((ret = H5Tis_hard(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=FALSE) {
+ if((ret = H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=FALSE) {
H5_FAILED();
printf("Can't query conversion function\n");
goto error;
@@ -621,7 +621,7 @@ test_hard_query(void)
/* Register the hard conversion from int to float. Verify the conversion
* is a hard conversion. */
H5Tregister(H5T_PERS_HARD, "int_flt", H5T_NATIVE_INT, H5T_NATIVE_FLOAT, H5T_conv_int_float);
- if((ret = H5Tis_hard(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=TRUE) {
+ if((ret = H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT))!=TRUE) {
H5_FAILED();
printf("Can't query conversion function\n");
goto error;
@@ -5052,7 +5052,7 @@ main(void)
/* Do the tests */
- /* Test H5Tis_hard() for querying hard conversion. */
+ /* Test H5Tcompiler_conv() for querying hard conversion. */
nerrors += test_hard_query();
/* Test user-define, query functions and software conversion