summaryrefslogtreecommitdiffstats
path: root/test/tid.c
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2014-11-18 17:57:48 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2014-11-18 17:57:48 (GMT)
commit4ddc3c769e595ded8b70cc843a79e5ab37ba60e7 (patch)
tree4d686637dd3e18b4be0e9b5ea45c993569f3b878 /test/tid.c
parent5cf77a2a7bfd44127db4c3b5d2b760666b2887a1 (diff)
downloadhdf5-4ddc3c769e595ded8b70cc843a79e5ab37ba60e7.zip
hdf5-4ddc3c769e595ded8b70cc843a79e5ab37ba60e7.tar.gz
hdf5-4ddc3c769e595ded8b70cc843a79e5ab37ba60e7.tar.bz2
[svn-r25823] Bring revisions #25484 - 25508 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'test/tid.c')
-rw-r--r--test/tid.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/tid.c b/test/tid.c
index 4ea45db..8c64b79 100644
--- a/test/tid.c
+++ b/test/tid.c
@@ -56,7 +56,7 @@ static int basic_id_test(void)
/* Try to access IDs with ficticious types */
H5E_BEGIN_TRY
- testPtr = H5Iobject_verify(100, (H5I_type_t) 0);
+ testPtr = H5Iobject_verify((hid_t)100, (H5I_type_t) 0);
H5E_END_TRY
VERIFY(testPtr, NULL, "H5Iobject_verify");
@@ -64,7 +64,7 @@ static int basic_id_test(void)
goto out;
H5E_BEGIN_TRY
- testPtr = H5Iobject_verify(700, (H5I_type_t) 700);
+ testPtr = H5Iobject_verify((hid_t)700, (H5I_type_t) 700);
H5E_END_TRY
VERIFY(testPtr, NULL, "H5Iobject_verify");
@@ -336,8 +336,8 @@ out:
static int test_is_valid(void)
{
hid_t dtype; /* datatype id */
- int nmembs1; /* number of type memnbers */
- int nmembs2;
+ int64_t nmembs1; /* number of type memnbers */
+ int64_t nmembs2;
htri_t tri_ret; /* htri_t return value */
herr_t ret; /* return value */
@@ -393,7 +393,7 @@ static int test_is_valid(void)
goto out;
/* Check that an id of -1 is invalid */
- tri_ret = H5Iis_valid(-1);
+ tri_ret = H5Iis_valid((hid_t)-1);
VERIFY(tri_ret, FALSE, "H4Iis_valid");
if (tri_ret != FALSE)
goto out;
@@ -427,13 +427,13 @@ static int test_get_type(void)
goto out;
/* Check that the ID is correct */
- type_ret = H5Iget_type(H5T_STRING);
+ type_ret = H5Iget_type((hid_t)H5T_STRING);
VERIFY(type_ret, H5I_BADID, "H5Iget_type");
if (type_ret != H5I_BADID)
goto out;
/* Check that the ID is correct */
- type_ret = H5Iget_type(-1);
+ type_ret = H5Iget_type((hid_t)-1);
VERIFY(type_ret, H5I_BADID, "H5Iget_type");
if (type_ret != H5I_BADID)
goto out;