diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-09 04:14:29 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-09 04:14:29 (GMT) |
commit | 20720af231c875330a6074f65ee1c54e6a806fbb (patch) | |
tree | 64ae80f3ab6b76c09e2c309e76eb161cf133eed4 /hl/c++/src/H5PacketTable.cpp | |
parent | 25d1056dbff92a7662ee73c67596d24906530dbc (diff) | |
download | hdf5-20720af231c875330a6074f65ee1c54e6a806fbb.zip hdf5-20720af231c875330a6074f65ee1c54e6a806fbb.tar.gz hdf5-20720af231c875330a6074f65ee1c54e6a806fbb.tar.bz2 |
[svn-r12735] Description:
Clean up some compiler warnings and resolve some inconsistenceis between
hsize_t and size_t in the interface.
Tested on:
FreeBSD/32 4.11 (sleipnir) w/threadsafe
Linux/32 2.4 (heping) w/FORTRAN & C++
Linux/64 2.4 (mir) w/enable-1.6-compat
Diffstat (limited to 'hl/c++/src/H5PacketTable.cpp')
-rw-r--r-- | hl/c++/src/H5PacketTable.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp index dc34995..abe9519 100644 --- a/hl/c++/src/H5PacketTable.cpp +++ b/hl/c++/src/H5PacketTable.cpp @@ -81,7 +81,7 @@ * Sets the index to point to the packet specified by index. * Returns 0 on success, negative on failure (if index is out of bounds) */ - int PacketTable::SetIndex(unsigned int index) + int PacketTable::SetIndex(hsize_t index) { return H5PTset_index(table_id, index); } @@ -90,7 +90,7 @@ * Sets the index to point to the packet specified by index. * Returns 0 on success, negative on failure (if index is out of bounds) */ - int PacketTable::GetIndex(int &error) + hsize_t PacketTable::GetIndex(int &error) { hsize_t index; @@ -157,7 +157,7 @@ * to be added and a pointer to their location in memory. * Returns 0 on success, -1 on failure. */ - int FL_PacketTable::AppendPackets(unsigned int numPackets, void * data) + int FL_PacketTable::AppendPackets(size_t numPackets, void * data) { return H5PTappend(table_id, numPackets, data); } @@ -168,7 +168,7 @@ * to memory where the data should be stored. * Returns 0 on success, negative on failure */ - int FL_PacketTable::GetPacket(unsigned int index, void * data) + int FL_PacketTable::GetPacket(hsize_t index, void * data) { return H5PTread_packets(table_id, index, 1, data); } @@ -179,7 +179,7 @@ * the memory where these packets should be stored. * Returns 0 on success, negative on failure. */ - int FL_PacketTable::GetPackets(unsigned int startIndex, unsigned int endIndex, void * data) + int FL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, void * data) { // Make sure the range of indexes is valid if (startIndex > endIndex) @@ -205,7 +205,7 @@ * Returns 0 on success, negative on failure. Index * is not advanced on failure. */ - int FL_PacketTable::GetNextPackets(unsigned int numPackets, void * data) + int FL_PacketTable::GetNextPackets(size_t numPackets, void * data) { return H5PTget_next(table_id, numPackets, data); } @@ -244,7 +244,7 @@ * in bytes. * Returns 0 on success, negative on failure. */ - int VL_PacketTable::AppendPacket(void * data, unsigned int length) + int VL_PacketTable::AppendPacket(void * data, size_t length) { hvl_t packet; @@ -260,7 +260,7 @@ * packets to be added and a pointer to an array of hvl_t structs in memory. * Returns 0 on success, negative on failure. */ - int VL_PacketTable::AppendPackets(unsigned int numPackets, hvl_t * data) + int VL_PacketTable::AppendPackets(size_t numPackets, hvl_t * data) { return H5PTappend(table_id, numPackets, data); } @@ -271,7 +271,7 @@ * to a hvl_t struct in which to store the packet's size and location. * Returns 0 on success, negative on failure. */ - int VL_PacketTable::GetPacket(unsigned int index, hvl_t * data) + int VL_PacketTable::GetPacket(hsize_t index, hvl_t * data) { return H5PTread_packets(table_id, index, 1, data); } @@ -282,7 +282,7 @@ * of hvl_t structs in memory in which to store pointers to the packets. * Returns 0 on success, negative on failure. */ - int VL_PacketTable::GetPackets(unsigned int startIndex, unsigned int endIndex, hvl_t * data) + int VL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, hvl_t * data) { // Make sure the range of indexes is valid if (startIndex > endIndex) @@ -309,7 +309,7 @@ * Returns 0 on success, negative on failure. Index * is not advanced on failure. */ - int VL_PacketTable::GetNextPackets(unsigned int numPackets, hvl_t * data) + int VL_PacketTable::GetNextPackets(size_t numPackets, hvl_t * data) { return H5PTget_next(table_id, numPackets, data); } @@ -320,7 +320,7 @@ * location in memory. * Returns 0 on success, negative on error. */ - int VL_PacketTable::FreeReadbuff(unsigned int numStructs, hvl_t * buffer) + int VL_PacketTable::FreeReadbuff(size_t numStructs, hvl_t * buffer) { return H5PTfree_vlen_readbuff( table_id, numStructs, buffer); } |