summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
Diffstat (limited to 'hl')
-rw-r--r--hl/c++/test/ptableTest.cpp6
-rw-r--r--hl/src/H5DS.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index 77edce4..da84006 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -78,7 +78,7 @@ int BasicTest()
{
herr_t err;
int myRecord;
- int count;
+ hsize_t count;
int error;
TESTING("basic funtionality")
@@ -133,7 +133,7 @@ out:
int TestCompoundDatatype()
{
hid_t dtypeID;
- int count;
+ hsize_t count;
int error;
TESTING("compound datatypes")
@@ -439,7 +439,7 @@ int SystemTest()
TESTING("multiple datatypes")
hid_t dtypeID1, dtypeID2;
- unsigned int count;
+ hsize_t count;
int error;
/* Creating two inter-related datatypes. Create two datasets and put
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index 08345c6..46eedc4 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -1478,7 +1478,7 @@ herr_t H5DSset_label(hid_t did,
if(H5Aclose(aid) < 0)
goto out;
if(buf)
- free(buf);
+ free((void *)buf);
}
/*-------------------------------------------------------------------------
@@ -1501,7 +1501,7 @@ herr_t H5DSset_label(hid_t did,
goto out;
/* read */
- if(H5Aread(aid, tid, buf) < 0)
+ if(H5Aread(aid, tid, (void *)buf) < 0)
goto out;
/* store the label information in the required index */
@@ -1517,7 +1517,7 @@ herr_t H5DSset_label(hid_t did,
if (H5Aclose(aid) < 0)
goto out;
if (buf)
- free(buf);
+ free((void *)buf);
}
return SUCCEED;