diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2015-11-04 17:49:19 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2015-11-04 17:49:19 (GMT) |
commit | 11778b82333fd06e625e4c571248910d501a1fd2 (patch) | |
tree | 3ce7e216d9f56072f43ddf26a50ee9321fe907a9 /hl | |
parent | 77e6ac3324feb5d196745f31df617d568b60d975 (diff) | |
download | hdf5-11778b82333fd06e625e4c571248910d501a1fd2.zip hdf5-11778b82333fd06e625e4c571248910d501a1fd2.tar.gz hdf5-11778b82333fd06e625e4c571248910d501a1fd2.tar.bz2 |
[svn-r28274] Applied patch to eliminate warnings from PRINTSTREAM macros from HDF5 1.8.16.
Update supported platform and tested configuration info in RELEASE.txt.
Tested with h5committest.new.
Diffstat (limited to 'hl')
-rw-r--r-- | hl/c++/src/H5PacketTable.cpp | 6 | ||||
-rw-r--r-- | hl/c++/src/H5PacketTable.h | 6 | ||||
-rw-r--r-- | hl/src/H5TB.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp index 74b8029..2a491de 100644 --- a/hl/c++/src/H5PacketTable.cpp +++ b/hl/c++/src/H5PacketTable.cpp @@ -34,7 +34,7 @@ * Opens an existing packet table, which can contain either fixed-length or * variable-length packets. */ - PacketTable::PacketTable(hid_t fileID, char* name) + PacketTable::PacketTable(hid_t fileID, const char* name) { table_id = H5PTopen( fileID, name); } @@ -127,7 +127,7 @@ * the packet table, the ID of the datatype of the set, and the size * of a memory chunk used in chunking. */ - FL_PacketTable::FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression) + FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize, int compression) { table_id = H5PTcreate_fl ( fileID, name, dtypeID, chunkSize, compression); } @@ -136,7 +136,7 @@ * Opens an existing fixed-length packet table. * Fails if the packet table specified is variable-length. */ - FL_PacketTable::FL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name) + FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name) : PacketTable(fileID, name) { #ifdef VLPT_REMOVED if( H5PTis_varlen(table_id) != 0 ) // If this is not a fixed-length table diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h index 5f9a213..c7c7fc0 100644 --- a/hl/c++/src/H5PacketTable.h +++ b/hl/c++/src/H5PacketTable.h @@ -42,7 +42,7 @@ public: * Opens an existing packet table, which can contain either fixed-length or * variable-length packets. */ - PacketTable(hid_t fileID, char* name); + PacketTable(hid_t fileID, const char* name); /* Destructor * Cleans up the packet table @@ -110,13 +110,13 @@ public: * of a memory chunk used in chunking, and the desired compression level * (0-9, or -1 for no compression). */ - FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression = -1); + FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize, int compression = -1); /* "Open" Constructor * Opens an existing fixed-length packet table. * Fails if the packet table specified is variable-length. */ - FL_PacketTable(hid_t fileID, char* name); + FL_PacketTable(hid_t fileID, const char* name); /* AppendPacket * Adds a single packet to the packet table. Takes a pointer diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index 1ca41a8..0f90393 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -2718,7 +2718,7 @@ herr_t H5TBdelete_field(hid_t loc_id, goto out; /* skip the field to delete */ - if(!H5TB_find_field(member_name, field_name) > 0) { + if(!H5TB_find_field(member_name, field_name)) { /* get the member type */ if((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0) goto out; |