From 11778b82333fd06e625e4c571248910d501a1fd2 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Wed, 4 Nov 2015 12:49:19 -0500 Subject: [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. --- hl/c++/src/H5PacketTable.cpp | 6 +-- hl/c++/src/H5PacketTable.h | 6 +-- hl/src/H5TB.c | 2 +- release_docs/RELEASE.txt | 117 +++++++++++++++--------------------------- tools/h5dump/h5dump_ddl.c | 6 ++- tools/h5dump/h5dump_defines.h | 31 ++++++----- tools/h5ls/h5ls.c | 3 +- tools/lib/h5tools.h | 8 +-- tools/lib/h5tools_utils.c | 3 +- 9 files changed, 78 insertions(+), 104 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; diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index bb6bc64..aeaeade 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -184,42 +184,33 @@ They are built with the configure process unless specified otherwise. (NASA G-ADA) xlC/xlC_r 10.1.0.5 xlf90/xlf90_r 12.1.0.6 - Linux 2.6.18-308.13.1.el5PAE GNU C (gcc), Fortran (gfortran), C++ (g++) - #1 SMP i686 i686 i386 compilers for 32-bit applications; - (jam) Version 4.1.2 20080704 (Red Hat 4.1.2-55) - Version 4.8.4, 4.9.2 - PGI C, Fortran, C++ Compilers for 32-bit - applications; - Version 14.10-0 - Intel(R) C, C++, Fortran Compiler for 32-bit - applications; - Version 15.0.1.133 (Build 20141023) - - Linux 2.6.18-371.6.1.el5 GNU C (gcc), Fortran (gfortran), C++ (g++) - #1 SMP x86_64 GNU/Linux compilers for 64-bit applications; - (koala) Version 4.1.2 20080704 (Red Hat 4.1.2-55) - Version 4.8.4, 4.9.2 - Intel(R) C, C++, Fortran Compilers for - applications running on Intel(R) 64; - Version 15.0.1.133 Build 20141023 - - Linux 2.6.32-431.11.2.el6 GNU C (gcc), Fortran (gfortran), C++ (g++) + Linux 2.6.32-573.3.1.el6 GNU C (gcc), Fortran (gfortran), C++ (g++) #1 SMP x86_64 GNU/Linux compilers: (platypus) Version 4.4.7 20120313 - Version 4.8.2, Version 4.9.2 + Version 4.8.4, Version 5.2.0 PGI C, Fortran, C++ for 64-bit target on x86-64; - Version 14.10-0 + Version 15.7-0 Intel(R) C (icc), C++ (icpc), Fortran (icc) compilers: - Version 15.0.1.133 Build 20141023 + Version 15.0.3.187 Build 20150407 + MPICH 3.1.4 compiled with GCC 4.9.3 - Linux 2.6.32-431.29.2.el6.ppc64 gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-4) - #1 SMP ppc64 GNU/Linux g++ (GCC) 4.4.7 20120313 (Red Hat 4.4.7-4) - (ostrich) GNU Fortran (GCC) 4.4.7 20120313 (Red Hat 4.4.7-4) + Linux 2.6.32-504.8.1.el6.ppc64 gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-11) + #1 SMP ppc64 GNU/Linux g++ (GCC) 4.4.7 20120313 (Red Hat 4.4.7-11) + (ostrich) GNU Fortran (GCC) 4.4.7 20120313 (Red Hat 4.4.7-11) IBM XL C/C++ V13.1 IBM XL Fortran V15.1 + Linux 3.10.0-229.14.1.el7 GNU C (gcc), Fortran (gfortran), C++ (g++) + #1 SMP x86_64 GNU/Linux compilers: + (kituo/moohan) Version 4.8.3 20140911 (Red Hat 4.8.3-9) + Version 5.2.0 + Intel(R) C (icc), C++ (icpc), Fortran (icc) + compilers: + Version 15.0.3.187 Build 20150407 + MPICH 3.1.4 compiled with GCC 4.9.3 + SunOS 5.11 32- and 64-bit Sun C 5.12 SunOS_sparc (emu) Sun Fortran 95 8.6 SunOS_sparc Sun C++ 5.12 SunOS_sparc @@ -241,16 +232,16 @@ They are built with the configure process unless specified otherwise. Visual Studio 2013 w/ Intel Fortran 15 (cmake) Mac OS X Mt. Lion 10.8.5 Apple clang/clang++ version 5.1 from Xcode 5.1 - 64-bit gfortran GNU Fortran (GCC) 4.8.2 - (swallow/kite) Intel icc/icpc/ifort version 14.0.2 + 64-bit gfortran GNU Fortran (GCC) 4.8.2 + (swallow/kite) Intel icc/icpc/ifort version 15.0.3 - Mac OS X Mavericks 10.9.5 Apple clang/clang++ version 6.0 from Xcode 6.1.1 - 64-bit gfortran GNU Fortran (GCC) 4.8.2 - (wren/quail) Intel icc/icpc/ifort version 14.0.2 + Mac OS X Mavericks 10.9.5 Apple clang/clang++ version 6.0 from Xcode 6.2.0 + 64-bit gfortran GNU Fortran (GCC) 4.9.2 + (wren/quail) Intel icc/icpc/ifort version 15.0.3 - Mac OS X Yosemeti 10.10.2 Apple clang/clang++ version 6.0 from Xcode 6.1.1 - 64-bit gfortran GNU Fortran (GCC) 4.9.2 - (osx1010dev/osx1010test) Intel icc/icpc/ifort version 15.0.1 + Mac OS X Yosemite 10.10.5 Apple clang/clang++ version 6.0 from Xcode 7.0.0 + 64-bit gfortran GNU Fortran (GCC) 4.9.2 + (osx1010dev/osx1010test) Intel icc/icpc/ifort version 15.0.3 Tested Configuration Features Summary @@ -277,18 +268,13 @@ Windows 8.1 n y/y n y y y Windows 8.1 x64 n y/y n y y y Mac OS X Mountain Lion 10.8.5 64-bit n y/y n y y y Mac OS X Mavericks 10.9.5 64-bit n y/y n y y y -Mac OS X Yosemeti 10.10.2 64-bit n y/y n y y y +Mac OS X Yosemeti 10.10.5 64-bit n y/y n y y y AIX 6.1 32- and 64-bit n y/n n y y y -CentOS 5.9 Linux 2.6.18-308 i686 GNU y y/y y y y y -CentOS 5.9 Linux 2.6.18-308 i686 Intel n y/y n y y y -CentOS 5.9 Linux 2.6.18-308 i686 PGI n y/y n y y y -CentOS 5.9 Linux 2.6.18 x86_64 GNU n y/y n y y y -CentOS 5.9 Linux 2.6.18 x86_64 Intel n y/y n y y y -CentOS 6.4 Linux 2.6.32 x86_64 GNU y y/y y y y y -CentOS 6.4 Linux 2.6.32 x86_64 Intel n y/y n y y y -CentOS 6.4 Linux 2.6.32 x86_64 PGI n y/y n y y y -CentOS 7.0 Linux 3.10.0 x86_64 GNU y y/y y y y y -CentOS 7.0 Linux 3.10.0 x86_64 Intel n y/y n y y y +CentOS 6.7 Linux 2.6.32 x86_64 GNU y y/y y y y y +CentOS 6.7 Linux 2.6.32 x86_64 Intel n y/y n y y y +CentOS 6.7 Linux 2.6.32 x86_64 PGI n y/y n y y y +CentOS 7.1 Linux 3.10.0 x86_64 GNU y y/y y y y y +CentOS 7.1 Linux 3.10.0 x86_64 Intel n y/y n y y y Linux 2.6.32-431.11.2.el6.ppc64 n y/n n y y y Platform Shared Shared Shared Thread- @@ -302,19 +288,14 @@ Windows 8.1 y y y y Windows 8.1 x64 y y y y Mac OS X Mountain Lion 10.8.5 64-bit y n y y Mac OS X Mavericks 10.9.5 64-bit y n y y -Mac OS X Yosemeti 10.10.2 64-bit y n y y +Mac OS X Yosemeti 10.10.5 64-bit y n y y AIX 6.1 32- and 64-bit y n n y -CentOS 5.9 Linux 2.6.18-308 i686 GNU y y y y -CentOS 5.9 Linux 2.6.18-308 i686 Intel y y y n -CentOS 5.9 Linux 2.6.18-308 i686 PGI y y y n -CentOS 5.9 Linux 2.6.18 x86_64 GNU y y y y -CentOS 5.9 Linux 2.6.18 x86_64 Intel y y y n -CentOS 6.4 Linux 2.6.32 x86_64 GNU y y y n -CentOS 6.4 Linux 2.6.32 x86_64 Intel y y y n -CentOS 6.4 Linux 2.6.32 x86_64 PGI y y y n -CentOS 7.0 Linux 3.10.0 x86_64 GNU y y y n -CentOS 7.0 Linux 3.10.0 x86_64 Intel y y y n -Linux 2.6.32-431.11.2.el6.ppc64 y y y n +CentOS 6.7 Linux 2.6.32 x86_64 GNU y y y y +CentOS 6.7 Linux 2.6.32 x86_64 Intel y y y y +CentOS 6.7 Linux 2.6.32 x86_64 PGI y y y y +CentOS 7.1 Linux 3.10.0 x86_64 GNU y y y y +CentOS 7.1 Linux 3.10.0 x86_64 Intel y y y y +Linux 2.6.32-431.11.2.el6.ppc64 y y y y Compiler versions for each platform are listed in the preceding "Supported Platforms" table. @@ -324,26 +305,12 @@ More Tested Platforms ===================== The following platforms are not supported but have been tested for this release. - Linux 2.6.18-308.13.1.el5PAE MPICH mpich 3.1.3 compiled with - #1 SMP i686 i686 i386 gcc 4.9.2 and gfortran 4.9.2 - (jam) g95 (GCC 4.0.3 (g95 0.94!) - - Linux 2.6.18-431.11.2.el6 MPICH mpich 3.1.3 compiled with - #1 SMP x86_64 GNU/Linux gcc 4.9.2 and gfortran 4.9.2 - (platypus) g95 (GCC 4.0.3 (g95 0.94!) - - FreeBSD 8.2-STABLE i386 gcc 4.5.4 [FreeBSD] 20110526 - (loyalty) gcc 4.6.1 20110527 - g++ 4.6.1 20110527 - gfortran 4.6.1 20110527 - - FreeBSD 8.2-STABLE amd64 gcc 4.5.4 [FreeBSD] 20110526 - (freedom) gcc 4.6.1 20110527 - g++ 4.6.1 20110527 - gfortran 4.6.1 20110527 + Linux 2.6.18-431.11.2.el6 g95 (GCC 4.0.3 (g95 0.94!) + #1 SMP x86_64 GNU/Linux + (platypus) Mac OS X El Capitan 10.11 Apple clang/clang++ version 7.0.0 from Xcode 7.0.1 - 64-bit gfortran GNU Fortran (GCC) 5.2.0 + 64-bit gfortran GNU Fortran (GCC) 5.2.0 (VM) Windows 7 Visual Studio 2008 (cmake) diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c index 11052fb..43d397c 100644 --- a/tools/h5dump/h5dump_ddl.c +++ b/tools/h5dump/h5dump_ddl.c @@ -1269,8 +1269,9 @@ dump_fcontents(hid_t fid) unsigned u; for (u = 0; u < type_table->nobjs; u++) { - if (!type_table->objs[u].recorded) + if (!type_table->objs[u].recorded) { PRINTSTREAM(rawoutstream, " %-10s /#"H5_PRINTF_HADDR_FMT"\n", "datatype", type_table->objs[u].objno); + } } } @@ -1874,8 +1875,9 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT begin_obj(h5tools_dump_header_format->softlinkbegin, links, h5tools_dump_header_format->softlinkblockbegin); PRINTVALSTREAM(rawoutstream, "\n"); indentation(COL); - if(H5Lget_val(fid, links, buf, linfo.u.val_size, H5P_DEFAULT) >= 0) + if(H5Lget_val(fid, links, buf, linfo.u.val_size, H5P_DEFAULT) >= 0) { PRINTSTREAM(rawoutstream, "LINKTARGET \"%s\"\n", buf); + } else { error_msg("h5dump error: unable to get link value for \"%s\"\n", links); h5tools_setstatus(EXIT_FAILURE); diff --git a/tools/h5dump/h5dump_defines.h b/tools/h5dump/h5dump_defines.h index 5f2df43..f1c4451 100644 --- a/tools/h5dump/h5dump_defines.h +++ b/tools/h5dump/h5dump_defines.h @@ -23,23 +23,26 @@ #define COL 3 /* Macros for displaying objects */ -#define begin_obj(obj,name,begin) \ - do { \ - if ((name)) \ +#define begin_obj(obj,name,begin) \ + do { \ + if ((name)) { \ PRINTSTREAM(rawoutstream, "%s \"%s\" %s", (obj), (name), (begin)); \ - else \ - PRINTSTREAM(rawoutstream, "%s %s", (obj), (begin)); \ + } else { \ + PRINTSTREAM(rawoutstream, "%s %s", (obj), (begin)); \ + } \ } while(0); -#define end_obj(obj,end) \ - do { \ - if(HDstrlen(end)) { \ - PRINTSTREAM(rawoutstream, "%s", end); \ - if(HDstrlen(obj)) \ - PRINTVALSTREAM(rawoutstream, " "); \ - } \ - if(HDstrlen(obj)) \ - PRINTSTREAM(rawoutstream, "%s", obj); \ +#define end_obj(obj,end) \ + do { \ + if(HDstrlen(end)) { \ + PRINTSTREAM(rawoutstream, "%s", end); \ + if(HDstrlen(obj)) { \ + PRINTVALSTREAM(rawoutstream, " "); \ + } \ + } \ + if(HDstrlen(obj)) { \ + PRINTSTREAM(rawoutstream, "%s", obj); \ + } \ } while(0); diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 4afb329..708e9de 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -2794,8 +2794,9 @@ main(int argc, const char *argv[]) file = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, preferred_driver, drivername, sizeof drivername); if(file >= 0) { - if(verbose_g) + if(verbose_g) { PRINTSTREAM(rawoutstream, "Opened \"%s\" with %s driver.\n", fname, drivername); + } break; /*success*/ } /* end if */ diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index d6c3720..5c08f33 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -37,10 +37,10 @@ #define H5TOOLS_DUMP_MAX_RANK H5S_MAX_RANK /* Stream macros */ -#define FLUSHSTREAM(S) if(S != NULL) HDfflush(S) -#define PRINTSTREAM(S, F, ...) if(S != NULL) HDfprintf(S, F, __VA_ARGS__) -#define PRINTVALSTREAM(S, V) if(S != NULL) HDfprintf(S, V) -#define PUTSTREAM(X,S) if(S != NULL) HDfputs(X, S); +#define FLUSHSTREAM(S) {if(S != NULL) HDfflush(S);} +#define PRINTSTREAM(S, F, ...) {if(S != NULL) HDfprintf(S, F, __VA_ARGS__);} +#define PRINTVALSTREAM(S, V) {if(S != NULL) HDfprintf(S, V);} +#define PUTSTREAM(X,S) {if(S != NULL) HDfputs(X, S);} /* * Strings for output - these were duplicated from the h5dump.h diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index fc8cf1d..572090b 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -482,10 +482,11 @@ dump_table(char* tablename, table_t *table) unsigned u; PRINTSTREAM(rawoutstream,"%s: # of entries = %d\n", tablename,table->nobjs); - for (u = 0; u < table->nobjs; u++) + for (u = 0; u < table->nobjs; u++) { PRINTSTREAM(rawoutstream,"%a %s %d %d\n", table->objs[u].objno, table->objs[u].objname, table->objs[u].displayed, table->objs[u].recorded); + } } -- cgit v0.12