diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-12 12:46:40 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-12 12:46:40 (GMT) |
| commit | 507a21125783ea03d75e8c6460212cd22f8466ee (patch) | |
| tree | a8279d3036e2bf3b625d33a104ac35996e26dfcf /hl | |
| parent | 4f61812180385bb969fee33eece609180cab4866 (diff) | |
| download | hdf5-507a21125783ea03d75e8c6460212cd22f8466ee.zip hdf5-507a21125783ea03d75e8c6460212cd22f8466ee.tar.gz hdf5-507a21125783ea03d75e8c6460212cd22f8466ee.tar.bz2 | |
[svn-r15462] Description:
Correct compiler warnings from Visual Studio.
Tested on:
Mac OS X/32 10.5.4 (amazon) w/FORTRAN & C++
(Too minor to require full h5committest)
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/test/ptableTest.cpp | 6 | ||||
| -rw-r--r-- | hl/src/H5DS.c | 6 |
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; |