diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-12 13:33:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-12 13:33:49 (GMT) |
| commit | 367f2125d956e1c38c99f59603df95f6f31b940e (patch) | |
| tree | 13d975fd64da87abc8944861d297585a3acdb5dc /hl | |
| parent | f040f990a065db070a83e3217c209a83e204d6ca (diff) | |
| download | hdf5-367f2125d956e1c38c99f59603df95f6f31b940e.zip hdf5-367f2125d956e1c38c99f59603df95f6f31b940e.tar.gz hdf5-367f2125d956e1c38c99f59603df95f6f31b940e.tar.bz2 | |
[svn-r15463] Description:
Bring revision 15462 (compiler warnings) back from trunk.
Tested on:
Mac OS X/32 10.5.4 (amazon) w/FORTRAN & C++
(Too minor to require 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 4e7d306..b91ced6 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -79,7 +79,7 @@ int BasicTest() { herr_t err; int myRecord; - int count; + hsize_t count; int error; TESTING("basic funtionality") @@ -134,7 +134,7 @@ out: int TestCompoundDatatype() { hid_t dtypeID; - int count; + hsize_t count; int error; TESTING("compound datatypes") @@ -440,7 +440,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; |