1.8/master (#317)hdf5-1_8_22

* Revert incorrect bool type

* Correct grep text for filter test

* Check sizeof type to use correct ref_type

* h5dump reg ref chnages has no error file

* Fix comment

* Remove unneeded files

* Verify the decoded version for "all" and "none" selection.

* Remove double entry

* Add missing include

* Snapshot version 1.8 release 22 (snap4)
Update version to 1.8-snap5

* Fixes for test failures with --disable-tests --disable-tools options.
Don't test ph5diff if tests are disabled.

* Correct conditions for parallel builds with and without tests.

* Snapshot version 1.8 release 22 (snap5)
Update version to 1.8.22-snap6

* TRILAB-192 merging warnings changes from develop

* Autotools reconfigure update

* Restore page ejects.

* Restore page eject chars

* Fix orphaned token

* Update LT files

* Correct extra flags and merge TRILAB-24

* Update release note for CMake warnings

* H5repack bug fixes from develop

* TRILAB-192 - merge changes from develop

Single source, config files, for warnings for both autotools and CMake.
Update CMake libraries, tools, tests to use correct flags.

* Add missing m4 file

* Remove 128bit config check fo 1.8

* TRILAB-192 update LTparse files

* A fix in the cleaning up code for datatype when datatype initialization via H5D__init_type() fails.
The code to fix the problem is the same as what is done in H5D__open_oid().

* Add missing " and update function calls incorrectly
named load_gcc_arguments.
Commit changes to gnu-cxxflags to remove unmatched " and to gnu-fflags
to not add C warnings flags to H5_FCFLAGS.

* TRILAB-192 - cleanup edits and match CMake CXX to autotools

* Fix shadowed type

* TRILAB-192 correct fortran commands

* TRILAB-192 version of std=f2008 special check

* Fix shadow variable

* Add prefix_relto_examplesdir function to set relative path to h5c++.

* TRILAB-192 - parser files cannot handle this warning

* Parallel Fortran tests now use the MPI module instead of including
mpif.h.

* Don't add general warnings flags for unsupported old versions of gcc and
g++ (older than gcc/g++ 4.2).
Correct gnu-cxxflags to determine warnings flags to be added based on
C++ compiler version instead of C compiler version.

* Snapshot version 1.8 release 22 (snap6)
Update version to 1.8.22-snap7

* TRILAB-244 separate CXX warnings and errors from C

* Fix NoFilter build

* Move ADD_H5_FLAGS macro from *CompilerFlags.cmake files to
config/cmake_ext_mod/HDFMacros.cmake for common use.

* Restrict errors to gcc 4.8 and above.

* OESS-65 replace szip with aec szip

* Correct CMake version

* Correct -Werror=unused-variable

* Add -Werror= flags to lists displayed in libhdf5.settings.

* Fix -Werror=unused-variable

* More fixes for unused variable

* Resolve warning errors from -Werror= flags:
  -Werror=bad-function-cast
  -Werror=bad-function-cast
  -Werror=implicit-function-declaration
  -Werror=nested-externs

* Remove verbose assignments in smoke_check 3 and 5 functions.

* Update to use optimization flags, C++ error flags, and correct
libhdf5.settings.in to remove unworkable changes.

* Update config/gnu-cxxflags.

* Add missing headers

* Fix ifort warning flag.
Restore AC_DEFUN([PAC_PROG_FC_DEFAULT_REALisDBLE] in m4/aclocal_fc.m4.
Add --enable-symbols, --enable-profiling, and --enable-optimization
options to autotools configure;  all configure flags for
--enable-production and --disable-production should match HDF5 1.10 and
1.12 production and debug default flags.

* Add github actions file

* Correct path

* OESS-65 Fix packaging

* Update reference name

* Correct filename

* disable pr action and enable fail fast

* Snapshot 1.8.22-snap7
Update version to 1.8.22-snap8.

* Correct mingw path

* Correct mingw paths

* Revise gnu-*flags and cmake/HDF*CompilerFlags.cmake files to add warning
flags for GCC compilers version 4.8 and above.
Removed files from gnu-warnings that only apply to versions < 4.8.
Consolidated warnings from versions < 4.8 that apply to versions >= 4.8
into the 4.8 warnings files.

* Update MANIFEST for removal of older warnings files.

* Yanked all MPI-1 calls
Added batch scripts in bin/batch.

* Snapshot 1.8.22-snap8.
Update version to 1.8.22-snap9.

* Squashed commit of the following:

commit 45b0cbc71929930a874e1c09e0770aa64d0ae697
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Thu Apr 23 13:14:56 2020 -0500

    Add C++ warnings treated as error for autotools builds.

commit 6debcddcc766601799d5bd661bd60946f951a07e
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Fri Jun 19 16:50:03 2020 -0500

    Remove tests for develop branch from testh5cc.sh.in.
    Add @H5_ECXXFLAGS@ to AM_CXXFLAGS.

commit fed497e7f207313b2a133d3b68c942b7d7104b90
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Fri Jun 12 15:06:39 2020 -0500

    Merge pull request #2646 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit '998c6470d78e14228695419c3b514c35ecf3d69e':
      Remove unnecessary version conditions for Clang compilers.

commit 92e52ce5c211bd1d3991a3b8bb67287ac7b652aa
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Wed Jun 10 18:53:45 2020 -0500

    Merge pull request #2639 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit 'a33667faf226f5d8c9633bf537893e8fce1bf1f6':
      Add c++ to --enable-sanitize-checks option.

commit 2e802534fb997b81fa98fdd1c7d97d4310898e0d
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Wed Jun 10 15:18:36 2020 -0500

    Merge pull request #2633 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit '20eab963899841c9a003baebead8e3bc07d9e127':
      Remove duplicate entries in MANIFEST.
      Make changes to CMake CompilerFlags.cmake files so extra flags are loaded for non-GNU compilers.
      Update new clang files to not pick up clang as vendor for pgCC. Add new files to MANIFEST Temporary demotion of 2 -Werror warning flags that fail on macos 10.12 Remove Production flag unknown to Apple clang.

commit 96ef60a58a23847a7da89a891f2415055ec2ab60
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Mon Jun 8 16:24:49 2020 -0500

    Merge pull request #2631 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit 'b942a4d8a3e27317cac50ce37ff5302d477664d8':
      Clean up code to get clang version in config/linux-gnulibc1

commit 8a7c687da568e8b50b38fa53da1ca63759be6ec4
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Mon Jun 8 11:42:37 2020 -0500

    Merge pull request #2623 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

    * commit 'c7626f79fdee4eee13925e240ef41e61f3367eab':
      Add flags from config/clang-warnings/*general files to H5 C and CXX flags for all versions of Clang and Clang++ compilers. Switched from cut to awk in testcheck_version.sh.in to avoid dependence on tab vs. " " in version definitions in H5public.h.
      Add files for adding warning flags for clang compilers in autotools configure.

commit db3ef7ff3c1ed79167cecef831501411cff8291f
Merge: 5a0f8d7 f9f1310
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Fri Jun 19 14:46:22 2020 -0500

    Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_12

commit 5a0f8d7940ae57b445f545a0abd7e303ce6924ee
Author: Larry Knox <lrknox@hdfgroup.org>
Date:   Wed Jun 10 20:15:41 2020 -0500

    Merge pull request #2636 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:HDFFV-11000-update-testh5cc.sh.in-for-version to develop

    * commit '5c0bd670d6e9919c463fbc05de99e2ba55b0761e':
      Add tests for all version to H5_NO_DEPRECATED_SYMBOLS section and to section for current version, with and without default API version flags.
      HDFFV-11000:  update-testh5cc.sh.in to test sample versioned functions in HDF5 1.10, 1.12 and develop.

* Update configure and Makefile.ins after bin/reconfigure.

* Fix MANIFEST

* Fix HDFFV-10591

Description:
    h52gif produced a segfault when a buffer overflow occurred because
    the data size was corrupted and became very large.  This commit added
    a check on the data size against the buffer size to prevent the segfault.
    It also added error reporting to h52gif to display an error message
    instead of silently exiting when the failure occurred.
Platforms tested:
    Linux/64 (jelly)

* Snapshot 1.8.22-snap9. Update version to 1.8.22-snap10.

* Merge pull request #2686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

* commit '800f93f7c994f88dfa716746153ded4b1e690e3a':
  Remove path to szip header file from AM_CPPFLAGS when configure check of libsz fails. Fix for HDFFV-10830.

* Regenerate configure.

* Merge from 1.10-1.12-dev - LT parse needs update

* Incorporate pull request #2693 from develop for the fix to HDFFV-11080:
(1) Patch up the file pointer when reading attribute of variable length datatype
(2) Test to verify the fix when doing multiple threads
(3) Update MANIFEST
(4) Add new test to Cmake

* Switch bison and flex update of LT files from bin/genltanalyse to
bin/genparser, and from automatically updating the LT files whenever
reconfigure is run to running only on man<F12>ual command.

* Update hl/sr/H5LT files.
Add bin/genparser to MANIFEST; remove bin/genltanalyze.

* Fix to the merge of PR #2708 for HDFFV-11080 to the 1.8 branch.
Need to checkin test/Makefile.in for the new file added.

* Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)

Description:
    When a buffer overflow occurred because a name length was corrupted
    and became very large, h5dump produced a segfault on one file and a
    memcpy parameter overlap on another file.  This commit added checks
    that detect a read pass the end of the buffer to prevent these error
    conditions.
Platforms tested:
    Linux/64 (jelly)

* Fixed typo

* Check for header szlib.h only when libsz passes AC_CHECK_LIB, so that
H5_HAVE_SALIB_H is not defined when szip is not enabled, to prevent
compile failures for incompatible szlib.

* HDFFV-11127 - force RTLD_LOCAL in dlopen

* spelling

* Remove extra parens

* Remove unnecessary assignment freom configure.ac.

* Add hypen to subrelease regex

* Add special case when H5_VERS_SUBRELEASE is 0

* Revert H5_VERS_SUBRELEASE check

* The version string has a second use for packaging

* MinGW uses "MinGW Makefiles"

* Snapshot 1.8.22-snap10. Update version to 1.8.22-snap11.

* Merge clang-format changes from develop

* remove stray file

* Source formatted

* Add options to github actions.

* Add back file, remove py file

* HDFFV-11096 Correct h5dump usage text

* Update formating

* remove autogen for 1.8 branch

* Fix comment whitespace

* Change '==' to 'eq' in test script

* Merge from develop

github updates
bin scripts
parser updates

* Snapshot 1.8.22-snap11. Update version to 1.8.22-snap12.

* Merge from 1.10

Comments, whitespace
Simple init and if block brackets.
Minimal code changes limited to return value and spelling

* Update autotools files

* Update FD source

* More merges from 1.10 comments and inits

* Comment fixes

* Fix macro argument

* Remove autogen file and cache dir

* Revert autotools files to previous version

* Correct boolean value and missing define

* URL and options corrections

* revert autoconf files

* Fix compile issues with vfd drivers.

* Fix HDFS test

* Remove extra #endif

* Move init above execution

* Multiple changes to bring branch up-to-date (#87)

Correct TARGET variable and CMake config file location.
Add option to allow filter plugins to be built inline.
Update CMake tools macros.

* hdf5 1 8 release text (#113)

* Multiple changes to bring branch up-to-date

Correct TARGET variable and CMake config file location.
Add option to allow filter plugins to be built inline.
Update CMake tools macros.

* release text updates - mostly whitespace

* Fixed HDFFV-10480 and HDFFV-11159 (#145)

* Fixed HDFFV-10480 and HDFFV-11159

Description
    Checked against buffer size to prevent segfault, in case of data corruption.

    + HDFFV-11159 CVE-2018-14033 Buffer over-read in H5O_layout_decode
    + HDFFV-10480 CVE-2018-11206 Buffer over-read in H5O_fill_new[/old]_decode and
        A user's patch was applied to this previously, but it is redone
        for a more correct fix, that is the check now accounted for the
        previous advance of the buffer pointer.

Platforms tested:
    Linux/64 (jelly)

* Fixed typo

* Update HDF5 1.8 copyright headers with updated copyright URL (#148)

* Update URL for COPYING file in copyright headers.

* Make fortran copyright headers uniformly spaced.

* Update url for Copyright file in c++/src/footer.html.

* OESS-98 Update plugin build option (#171)

* 1.8 has extra fortran CMake option (#176)

* 1.8 has extra fortran CMake option

* Update license URL

* OESS-98 fix tools test for plugins (#180)

* Hdf5 1 8 (#169)

* Fixed HDFFV-10480 and HDFFV-11159

Description
    Checked against buffer size to prevent segfault, in case of data corruption.

    + HDFFV-11159 CVE-2018-14033 Buffer over-read in H5O_layout_decode
    + HDFFV-10480 CVE-2018-11206 Buffer over-read in H5O_fill_new[/old]_decode and
        A user's patch was applied to this previously, but it is redone
        for a more correct fix, that is the check now accounted for the
        previous advance of the buffer pointer.

Platforms tested:
    Linux/64 (jelly)

* Fixed typo

* Fixed HDFFV-11150

Description
    Replaced an HDassert with a check for null pointer in H5O_dec_rc() to
    catch null pointer in corrupted data situation.
    Reversed the fix in svn-r24463 in which a check for null pointer prior
    to calling H5O_dec_rc()
Platforms tested:
    Linux/64 (jelly)

* HDF5 1 8 fix fortran build on macs (#186)

* Correct fortran and shared libs option

* Fix for no shared fortran build

* OESS-98 fix hdf5 link target (#191)

* Partial changes to RELEASE.txt for release. (#185)

* Partial changes to RELEASE.txt for release.

* Update supported and tested platforms.

* Update version to 1.8.22-12.

* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Update directory for SZ filter in HDF5PluginMacros.cmake.
Updates for release:
    Switch configure default to production mode.
    Set HDF5_GENERATE_HEADERS to OFF.

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Restores maintainer mode in the autotools (#200) (#203)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>

* Hdf5 1 8 22 (#212)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Brings ttsafe_attr_vlen.c changes from develop (#214)

Fixes exposed pthread problem on Windows.

* Update SO numbers for Hdf5 1 8 22 (#215)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Hdf5 1 8 22 (#224)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>

* Update CMake/HDF5Examples version in bin/release

* Update CMake/HDF5Examples version number in bin/release (#225)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>

* Fixed typo in an error message. (#228)

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* Bring 3 small changes from Hdf5 1.8 to 1.8.22 (#241)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Stat st blocks fix 1822 (#251)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* Fixes Autotools detection of the st_blocks field in stat (#246)

* Fixes Autotools detection of the st_blocks field in stat

The Autotools and CMake will now both correctly determine if the
stat struct has the st_blocks field and set H5_HAVE_STAT_ST_BLOCKS
appropriately.

* Fixes a typo in configure.ac

* Restore lines in RELEASE.txt.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Stat st blocks fix 1822 (#256)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* Fixes Autotools detection of the st_blocks field in stat (#246)

* Fixes Autotools detection of the st_blocks field in stat

The Autotools and CMake will now both correctly determine if the
stat struct has the st_blocks field and set H5_HAVE_STAT_ST_BLOCKS
appropriately.

* Fixes a typo in configure.ac

* Restore lines in RELEASE.txt.

* Updated configure with reconfigure.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* RELEASE.txt cleanup.

* Hdf5 1 8 22 (#261)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Hdf5 1 8 22 (#266)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Hdf5 1 8 22 - Reverts lock/unlock callback signature to 1.8.21 version (#267)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Update version in H5public.h

* Hdf5 1 8 22 (#269)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Update version in H5public.h

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Set version 1.8.22 for release.

* dd RELEASE.txt entry for HDFFV-10741.

* Hdf5 1 8 22 (#279)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Update version in H5public.h

* Set version 1.8.22 for release.

* dd RELEASE.txt entry for HDFFV-10741.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

* Improve performance of multiple calls to H5Sget_select_elem_pointlist (#270) (#277)

* Cache the pointer to the next point to process after the last call to
H5S__get_select_elem_pointlist.  This allows the normal process of
iterating over the points in batches to be much more efficient, as the
library does not need to traverse the entirety of the preceding points
every time the funciton is re-entered.

* Update RELEASE.txt for point selection iteration performance fix.

* Hdf5 1 8 22 (#281)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

* Update version in H5public.h

* Set version 1.8.22 for release.

* dd RELEASE.txt entry for HDFFV-10741.

* Improve performance of multiple calls to H5Sget_select_elem_pointlist (#270) (#277)

* Cache the pointer to the next point to process after the last call to
H5S__get_select_elem_pointlist.  This allows the normal process of
iterating over the points in batches to be much more efficient, as the
library does not need to traverse the entirety of the preceding points
every time the funciton is re-entered.

* Update RELEASE.txt for point selection iteration performance fix.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
Co-authored-by: Neil Fortner <nfortne2@hdfgroup.org>

* Hdf5 1 8 22 (#284)

* Fixed typo in an error message.

* Updated for HDFFV-11150, HDFFV-10480, and HDFFV-11159

* Update "Support for New Platforms and Compilers" section in RELEASE.txt;
add check_version workaround for binary compatibility to "Known
Problems".

* Add SUSE Linux to tested platforms.

* Update numbers in config/lt_vers.am and run bin/reconfigure for so
numbers.

* Update version in 3 files missed by merge.

Co-authored-by: Allen Byrne <byrn@hdfgroup.org>
Co-authored-by: Vailin Choi <vchoi@hdfgroup.org>
Co-authored-by: vchoi <vchoi@jelly.ad.hdfgroup.org>
Co-authored-by: hdftest <hdftest@hdfgroup.org>
Co-authored-by: Jordan Henderson <jhenderson@hdfgroup.org>
Co-authored-by: Dana Robinson <derobins@hdfgroup.org>
Co-authored-by: Binh-Minh Ribler <bmribler@hdfgroup.org>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Neil Fortner <nfortne2@hdfgroup.org>

5 files changed, 365 insertions, 326 deletions

diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 7949b73..0c9b04b 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -1,42 +1,56 @@
-cmake_minimum_required (VERSION 3.10)
-PROJECT (HDF5_HL_CPP_SRC)
+cmake_minimum_required (VERSION 3.12)
+project (HDF5_HL_CPP_SRC CXX)
 
 #-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_SOURCE_DIR})
 
-set (HDF5_HL_CPP_SRCS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
+set (HDF5_HL_CPP_SOURCES ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
 set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
 
-add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SRCS})
-TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} STATIC " " " ")
-target_link_libraries (${HDF5_HL_CPP_LIB_TARGET} PUBLIC ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} STATIC 0)
-set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES
-    FOLDER libraries/hl
-    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-)
-set (install_targets ${HDF5_HL_CPP_LIB_TARGET})
+if (NOT ONLY_SHARED_LIBS)
+  add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SOURCES} ${HDF5_HL_CPP_HDRS})
+  target_include_directories (${HDF5_HL_CPP_LIB_TARGET}
+      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_HL_CPP_LIB_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+  TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} STATIC)
+  target_link_libraries (${HDF5_HL_CPP_LIB_TARGET} PUBLIC ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} STATIC 0)
+  set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/hl)
+  set (install_targets ${HDF5_HL_CPP_LIB_TARGET})
+endif ()
 
 if (BUILD_SHARED_LIBS)
-  add_library (${HDF5_HL_CPP_LIBSH_TARGET} SHARED ${HDF5_HL_CPP_SRCS})
-  TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIBSH_TARGET} SHARED " " " ")
+  add_library (${HDF5_HL_CPP_LIBSH_TARGET} SHARED ${HDF5_HL_CPP_SOURCES})
+  target_include_directories (${HDF5_HL_CPP_LIBSH_TARGET}
+      PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+      INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+  )
+  target_compile_options(${HDF5_HL_CPP_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
+  target_compile_definitions(${HDF5_HL_CPP_LIBSH_TARGET} PUBLIC "H5_BUILT_AS_DYNAMIC_LIB")
+  TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIBSH_TARGET} SHARED)
   target_link_libraries (${HDF5_HL_CPP_LIBSH_TARGET} PUBLIC ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIBSH_TARGET} ${HDF5_HL_CPP_LIB_NAME} SHARED "HL_CXX")
-  set_target_properties (${HDF5_HL_CPP_LIBSH_TARGET} PROPERTIES
-      FOLDER libraries/hl
-      COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
-      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-      INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
-  )
+  set_target_properties (${HDF5_HL_CPP_LIBSH_TARGET} PROPERTIES FOLDER libraries/hl)
   set (install_targets ${install_targets} ${HDF5_HL_CPP_LIBSH_TARGET})
 endif ()
 
 #-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_HL_CPP_SRC_FORMAT ${HDF5_HL_CPP_LIB_TARGET})
+  else ()
+    clang_format (HDF5_HL_CPP_SRC_FORMAT ${HDF5_HL_CPP_LIBSH_TARGET})
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install (
@@ -55,7 +69,9 @@ if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
     INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
   endif ()
-  INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} hlcpplibraries)
+  if (NOT ONLY_SHARED_LIBS)
+    INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries)
+  endif ()
 
   install (
       TARGETS
@@ -82,13 +98,15 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
 
 set (_PKG_CONFIG_LIBS_PRIVATE)
 
-set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+if (NOT ONLY_SHARED_LIBS)
+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+endif ()
 if (BUILD_SHARED_LIBS)
   set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
 endif ()
 
-set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}")
-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}")
+set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")
 
 configure_file (
     ${HDF_RESOURCES_DIR}/libhdf5.pc.in
@@ -101,7 +119,7 @@ install (
     COMPONENT hlcpplibraries
 )
 
-if (NOT WIN32)
+if (NOT WIN32 AND NOT MINGW)
   set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
   configure_file (
       ${HDF_RESOURCES_DIR}/libh5cc.in
@@ -115,4 +133,3 @@ if (NOT WIN32)
       COMPONENT hlcpplibraries
   )
 endif ()
-
diff --git a/hl/c++/src/H5PacketTable.cpp b/hl/c++/src/H5PacketTable.cpp
index 544df0b..eca3ed1 100644
--- a/hl/c++/src/H5PacketTable.cpp
+++ b/hl/c++/src/H5PacketTable.cpp
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -24,257 +24,265 @@
 
 #include "H5PacketTable.h"
 
-    /********************************/
-    /* PacketTable superclass       */
-    /********************************/
-
-    /* "Open" Constructor
-     * Opens an existing packet table, which can contain either fixed-length or
-     * variable-length packets.
-     */
-    PacketTable::PacketTable(hid_t fileID, const char* name)
-    {
-        table_id = H5PTopen( fileID, name);
-    }
-
-    /* "Open" Constructor - will be deprecated because of char* name */
-    PacketTable::PacketTable(hid_t fileID, char* name)
-    {
-        table_id = H5PTopen( fileID, name);
-    }
-
-    /* Destructor
-     * Cleans up the packet table
-     */
-    PacketTable::~PacketTable()
-    {
-        H5PTclose( table_id);
-    }
-
-    /* IsValid
-     * Returns true if this packet table is valid, false otherwise.
-     * Use this after the constructor to ensure HDF did not have
-     * any trouble making or opening the packet table.
-     */
-    bool PacketTable::IsValid()
-    {
-        if (H5PTis_valid(table_id) == 0)
-            return true;
-        else
-            return false;
-    }
-
-    /* IsVariableLength
-     * Return 1 if this packet table uses variable-length datatype,
-     * and 0, otherwise.  Returns -1 if the table is invalid (not open).
-     */
-    int PacketTable::IsVariableLength()
-    {
-        return H5PTis_varlen(table_id);
-    }
-
-    /* ResetIndex
-     * Sets the index to point to the first packet in the packet table
-     */
-    void PacketTable::ResetIndex()
-    {
-        H5PTcreate_index(table_id);
-    }
-
-    /* SetIndex
-     * 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(hsize_t index)
-    {
-        return H5PTset_index(table_id, index);
-    }
-
-    /* SetIndex
-     * Sets the index to point to the packet specified by index.
-     * Returns 0 on success, negative on failure (if index is out of bounds)
-     */
-    hsize_t PacketTable::GetIndex(int &error)
-    {
-        hsize_t index;
-
-        error = H5PTget_index(table_id, &index);
-        if(error < 0)
-           return 0;
-        else
-           return index;
-    }
-
-    /* GetPacketCount
-     * Returns the number of packets in the packet table.  Error
-     * is set to 0 on success.  On failure, returns 0 and
-     * error is set to negative.
-     */
-    hsize_t PacketTable::GetPacketCount(int& error)
-    {
-        hsize_t npackets;
-
-        error = H5PTget_num_packets(table_id, &npackets);
-        return npackets;
-    }
-
-    /* GetTableId
-     * Returns the identifier of the packet table
-     */
-    hid_t PacketTable::GetTableId()
-    {
-        return table_id;
-    }
-
-    /* GetDatatype
-     * Returns the datatype identifier used by the packet table, on success,
-     * or H5I_INVALID_HID, on failure.
-     * Note: it is best to avoid using this identifier in applications, unless
-     * the desired functionality cannot be performed via the packet table ID.
-     */
-    hid_t PacketTable::GetDatatype()
-    {
-        return H5PTget_type(table_id);
-    }
-
-    /* GetDataset
-     * Returns the dataset identifier associated with the packet table, on
-     * success, or H5I_INVALID_HID, on failure.
-     * Note: it is best to avoid using this identifier in applications, unless
-     * the desired functionality cannot be performed via the packet table ID.
-     */
-    hid_t PacketTable::GetDataset()
-    {
-        return H5PTget_dataset(table_id);
-    }
-
-    /* FreeBuff
-     * Frees the buffers created when variable-length packets are read.
-     * Takes the number of hvl_t structs to be freed and a pointer to their
-     * location in memory.
-     * Returns 0 on success, negative on error.
-     */
-    int PacketTable::FreeBuff(size_t numStructs, hvl_t * buffer)
-    {
-        return H5PTfree_vlen_buff( table_id, numStructs, buffer);
-    }
-
-
-    /********************************/
-    /* Fixed-Length Packet Table    */
-    /********************************/
-
-    /* Constructor
-     * Creates a packet table to store either fixed- or variable-length packets.
-     * Takes the ID of the file the packet table will be created in, the ID of
-     * the property list to specify compression, the name of the packet table,
-     * the ID of the datatype, and the size of a memory chunk used in chunking.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize, hid_t plistID)
-    {
-        table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
-    }
-
-    /* Constructor - deprecated
-     * Creates a packet table to store either fixed- or variable-length packets.
-     * Takes the ID of the file the packet table will be created in, the ID of
-     * the property list to specify compression, the name of the packet table,
-     * the ID of the datatype, and the size of a memory chunk used in chunking.
-     * Note: The above constructor has a better prototype, which allows default
-     * values to be used.  This constructor was only released in 1.10.0.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, hid_t plistID, const char* name, hid_t dtypeID, hsize_t chunkSize)
-    {
-        table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
-    }
-
-    /* Constructor
-     * Creates a packet table to store either fixed- or variable-length packets.
-     * Takes the ID of the file the packet table will be created in, the name of
-     * the packet table, the ID of the datatype of the set, and the size
-     * of a memory chunk used in chunking.
-     * Note: this overload will be deprecated in favor of the constructor above.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression)
-    {
-        table_id = H5PTcreate_fl(fileID, name, dtypeID, chunkSize, compression);
-    }
-
-    /* "Open" Constructor
-     * Opens an existing fixed-length packet table.
-     * Fails if the packet table specified is variable-length.
-     */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name) : PacketTable(fileID, name) {}
-
-    /* "Open" Constructor - will be deprecated because of char* name */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name) {}
-
-    /* AppendPacket
-     * Adds a single packet to the packet table.  Takes a pointer
-     * to the location of the data in memory.
-     * Returns 0 on success, negative on failure
-     */
-    int FL_PacketTable::AppendPacket(void * data)
-    {
-        return H5PTappend(table_id, 1, data);
-    }
-
-    /* AppendPackets (multiple packets)
-     * Adds multiple packets to the packet table.  Takes the number of packets
-     * to be added and a pointer to their location in memory.
-     * Returns 0 on success, -1 on failure.
-     */
-    int FL_PacketTable::AppendPackets(size_t numPackets, void * data)
-    {
-        return H5PTappend(table_id, numPackets, data);
-    }
-
-    /* GetPacket (indexed)
-     * Gets a single packet from the packet table.  Takes the index
-     * of the packet (with 0 being the first packet) and a pointer
-     * to memory where the data should be stored.
-     * Returns 0 on success, negative on failure
-     */
-    int FL_PacketTable::GetPacket(hsize_t index, void * data)
-    {
-        return H5PTread_packets(table_id, index, 1, data);
-    }
-
-    /* GetPackets (multiple packets)
-     * Gets multiple packets at once, all packets between
-     * startIndex and endIndex inclusive.  Also takes a pointer to
-     * the memory where these packets should be stored.
-     * Returns 0 on success, negative on failure.
-     */
-    int FL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, void * data)
-    {
-        // Make sure the range of indexes is valid
-        if (startIndex > endIndex)
-            return -1;
-
-        return  H5PTread_packets(table_id, startIndex, (size_t)(endIndex-startIndex+1), data);
-    }
-
-    /* GetNextPacket (single packet)
-     * Gets the next packet in the packet table.  Takes a pointer to
-     * memory where the packet should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced to the next packet on failure.
-     */
-    int FL_PacketTable::GetNextPacket(void * data)
-    {
-        return H5PTget_next(table_id, 1, data);
-    }
-
-    /* GetNextPackets (multiple packets)
-     * Gets the next numPackets packets in the packet table.  Takes a
-     * pointer to memory where these packets should be stored.
-     * Returns 0 on success, negative on failure.  Index
-     * is not advanced on failure.
-     */
-    int FL_PacketTable::GetNextPackets(size_t numPackets, void * data)
-    {
-        return H5PTget_next(table_id, numPackets, data);
-    }
+/********************************/
+/* PacketTable superclass       */
+/********************************/
+
+/* "Open" Constructor
+ * Opens an existing packet table, which can contain either fixed-length or
+ * variable-length packets.
+ */
+PacketTable::PacketTable(hid_t fileID, const char *name) { table_id = H5PTopen(fileID, name); }
+
+/* "Open" Constructor - will be deprecated because of char* name */
+PacketTable::PacketTable(hid_t fileID, char *name) { table_id = H5PTopen(fileID, name); }
+
+/* Destructor
+ * Cleans up the packet table
+ */
+PacketTable::~PacketTable() { H5PTclose(table_id); }
+
+/* IsValid
+ * Returns true if this packet table is valid, false otherwise.
+ * Use this after the constructor to ensure HDF did not have
+ * any trouble making or opening the packet table.
+ */
+bool
+PacketTable::IsValid()
+{
+    if (H5PTis_valid(table_id) == 0)
+        return true;
+    else
+        return false;
+}
+
+/* IsVariableLength
+ * Return 1 if this packet table uses variable-length datatype,
+ * and 0, otherwise.  Returns -1 if the table is invalid (not open).
+ */
+int
+PacketTable::IsVariableLength()
+{
+    return H5PTis_varlen(table_id);
+}
+
+/* ResetIndex
+ * Sets the index to point to the first packet in the packet table
+ */
+void
+PacketTable::ResetIndex()
+{
+    H5PTcreate_index(table_id);
+}
+
+/* SetIndex
+ * 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(hsize_t index)
+{
+    return H5PTset_index(table_id, index);
+}
+
+/* SetIndex
+ * Sets the index to point to the packet specified by index.
+ * Returns 0 on success, negative on failure (if index is out of bounds)
+ */
+hsize_t
+PacketTable::GetIndex(int &error)
+{
+    hsize_t index;
+
+    error = H5PTget_index(table_id, &index);
+    if (error < 0)
+        return 0;
+    else
+        return index;
+}
+
+/* GetPacketCount
+ * Returns the number of packets in the packet table.  Error
+ * is set to 0 on success.  On failure, returns 0 and
+ * error is set to negative.
+ */
+hsize_t
+PacketTable::GetPacketCount(int &error)
+{
+    hsize_t npackets;
+
+    error = H5PTget_num_packets(table_id, &npackets);
+    return npackets;
+}
+
+/* GetTableId
+ * Returns the identifier of the packet table
+ */
+hid_t
+PacketTable::GetTableId()
+{
+    return table_id;
+}
+
+/* GetDatatype
+ * Returns the datatype identifier used by the packet table, on success,
+ * or H5I_INVALID_HID, on failure.
+ * Note: it is best to avoid using this identifier in applications, unless
+ * the desired functionality cannot be performed via the packet table ID.
+ */
+hid_t
+PacketTable::GetDatatype()
+{
+    return H5PTget_type(table_id);
+}
+
+/* GetDataset
+ * Returns the dataset identifier associated with the packet table, on
+ * success, or H5I_INVALID_HID, on failure.
+ * Note: it is best to avoid using this identifier in applications, unless
+ * the desired functionality cannot be performed via the packet table ID.
+ */
+hid_t
+PacketTable::GetDataset()
+{
+    return H5PTget_dataset(table_id);
+}
+
+/* FreeBuff
+ * Frees the buffers created when variable-length packets are read.
+ * Takes the number of hvl_t structs to be freed and a pointer to their
+ * location in memory.
+ * Returns 0 on success, negative on error.
+ */
+int
+PacketTable::FreeBuff(size_t numStructs, hvl_t *buffer)
+{
+    return H5PTfree_vlen_buff(table_id, numStructs, buffer);
+}
+
+/********************************/
+/* Fixed-Length Packet Table    */
+/********************************/
+
+/* Constructor
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the ID of
+ * the property list to specify compression, the name of the packet table,
+ * the ID of the datatype, and the size of a memory chunk used in chunking.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name, hid_t dtypeID, hsize_t chunkSize,
+                               hid_t plistID)
+{
+    table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
+}
+
+/* Constructor - deprecated
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the ID of
+ * the property list to specify compression, the name of the packet table,
+ * the ID of the datatype, and the size of a memory chunk used in chunking.
+ * Note: The above constructor has a better prototype, which allows default
+ * values to be used.  This constructor was only released in 1.10.0.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, hid_t plistID, const char *name, hid_t dtypeID,
+                               hsize_t chunkSize)
+{
+    table_id = H5PTcreate(fileID, name, dtypeID, chunkSize, plistID);
+}
+
+/* Constructor
+ * Creates a packet table to store either fixed- or variable-length packets.
+ * Takes the ID of the file the packet table will be created in, the name of
+ * the packet table, the ID of the datatype of the set, and the size
+ * of a memory chunk used in chunking.
+ * Note: this overload will be deprecated in favor of the constructor above.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, char *name, hid_t dtypeID, hsize_t chunkSize, int compression)
+{
+    table_id = H5PTcreate_fl(fileID, name, dtypeID, chunkSize, compression);
+}
+
+/* "Open" Constructor
+ * Opens an existing fixed-length packet table.
+ * Fails if the packet table specified is variable-length.
+ */
+FL_PacketTable::FL_PacketTable(hid_t fileID, const char *name) : PacketTable(fileID, name) {}
+
+/* "Open" Constructor - will be deprecated because of char* name */
+FL_PacketTable::FL_PacketTable(hid_t fileID, char *name) : PacketTable(fileID, name) {}
+
+/* AppendPacket
+ * Adds a single packet to the packet table.  Takes a pointer
+ * to the location of the data in memory.
+ * Returns 0 on success, negative on failure
+ */
+int
+FL_PacketTable::AppendPacket(void *data)
+{
+    return H5PTappend(table_id, 1, data);
+}
+
+/* AppendPackets (multiple packets)
+ * Adds multiple packets to the packet table.  Takes the number of packets
+ * to be added and a pointer to their location in memory.
+ * Returns 0 on success, -1 on failure.
+ */
+int
+FL_PacketTable::AppendPackets(size_t numPackets, void *data)
+{
+    return H5PTappend(table_id, numPackets, data);
+}
+
+/* GetPacket (indexed)
+ * Gets a single packet from the packet table.  Takes the index
+ * of the packet (with 0 being the first packet) and a pointer
+ * to memory where the data should be stored.
+ * Returns 0 on success, negative on failure
+ */
+int
+FL_PacketTable::GetPacket(hsize_t index, void *data)
+{
+    return H5PTread_packets(table_id, index, 1, data);
+}
+
+/* GetPackets (multiple packets)
+ * Gets multiple packets at once, all packets between
+ * startIndex and endIndex inclusive.  Also takes a pointer to
+ * the memory where these packets should be stored.
+ * Returns 0 on success, negative on failure.
+ */
+int
+FL_PacketTable::GetPackets(hsize_t startIndex, hsize_t endIndex, void *data)
+{
+    // Make sure the range of indexes is valid
+    if (startIndex > endIndex)
+        return -1;
+
+    return H5PTread_packets(table_id, startIndex, (size_t)(endIndex - startIndex + 1), data);
+}
+
+/* GetNextPacket (single packet)
+ * Gets the next packet in the packet table.  Takes a pointer to
+ * memory where the packet should be stored.
+ * Returns 0 on success, negative on failure.  Index
+ * is not advanced to the next packet on failure.
+ */
+int
+FL_PacketTable::GetNextPacket(void *data)
+{
+    return H5PTget_next(table_id, 1, data);
+}
+
+/* GetNextPackets (multiple packets)
+ * Gets the next numPackets packets in the packet table.  Takes a
+ * pointer to memory where these packets should be stored.
+ * Returns 0 on success, negative on failure.  Index
+ * is not advanced on failure.
+ */
+int
+FL_PacketTable::GetNextPackets(size_t numPackets, void *data)
+{
+    return H5PTget_next(table_id, numPackets, data);
+}
 
 /* Removed "ifdef VLPT_REMOVED" block. 03/08/2016, -BMR */
diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index 2665984..735901f 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -28,22 +28,21 @@
 #include "H5PTpublic.h"
 #include "H5api_adpt.h"
 
-class H5_HLCPPDLL  PacketTable
-{
-public:
+class H5_HLCPPDLL PacketTable {
+  public:
     /* Null constructor
      * Sets table_id to "invalid"
      */
-    PacketTable() {table_id = H5I_BADID;}
+    PacketTable() { table_id = H5I_BADID; }
 
     /* "Open" Constructor
      * Opens an existing packet table, which can contain either fixed-length or
      * variable-length packets.
      */
-    PacketTable(hid_t fileID, const char* name);
+    PacketTable(hid_t fileID, const char *name);
 
     /* "Open" Constructor - will be deprecated because of char* name */
-    PacketTable(hid_t fileID, char* name);
+    PacketTable(hid_t fileID, char *name);
 
     /* Destructor
      * Cleans up the packet table
@@ -80,16 +79,17 @@ public:
      * Returns the position of the current packet.
      * On failure, returns 0 and error is set to negative.
      */
-    hsize_t GetIndex(int& error);
+    hsize_t GetIndex(int &error);
 
     /* GetPacketCount
      * Returns the number of packets in the packet table.  Error
      * is set to 0 on success.  On failure, returns 0 and
      * error is set to negative.
      */
-    hsize_t GetPacketCount(int& error);
+    hsize_t GetPacketCount(int &error);
 
-    hsize_t GetPacketCount()
+    hsize_t
+    GetPacketCount()
     {
         int ignoreError;
         return GetPacketCount(ignoreError);
@@ -122,22 +122,22 @@ public:
      * location in memory.
      * Returns 0 on success, negative on error.
      */
-    int FreeBuff(size_t numStructs, hvl_t * buffer);
+    int FreeBuff(size_t numStructs, hvl_t *buffer);
 
-protected:
+  protected:
     hid_t table_id;
 };
 
-class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable
-{
-public:
+class H5_HLCPPDLL FL_PacketTable : virtual public PacketTable {
+  public:
     /* Constructor
      * Creates a packet table to store either fixed- or variable-length packets.
      * Takes the ID of the file the packet table will be created in, the ID of
      * the property list to specify compression, the name of the packet table,
      * the ID of the datatype, and the size of a memory chunk used in chunking.
      */
-    FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize = 0, hid_t plistID = H5P_DEFAULT);
+    FL_PacketTable(hid_t fileID, const char *name, hid_t dtypeID, hsize_t chunkSize = 0,
+                   hid_t plistID = H5P_DEFAULT);
 
     /* Constructors - deprecated
      * Creates a packet table in which to store fixed length packets.
@@ -148,36 +148,36 @@ public:
      * Note: these overloaded constructors will be deprecated in favor of the
      * constructor above.
      */
-    FL_PacketTable(hid_t fileID, hid_t plist_id, const char* name, hid_t dtypeID, hsize_t chunkSize);
-    FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression = 0);
+    FL_PacketTable(hid_t fileID, hid_t plist_id, const char *name, hid_t dtypeID, hsize_t chunkSize);
+    FL_PacketTable(hid_t fileID, char *name, hid_t dtypeID, hsize_t chunkSize, int compression = 0);
 
     /* "Open" Constructor
      * Opens an existing fixed-length packet table.
      * Fails if the packet table specified is variable-length.
      */
-    FL_PacketTable(hid_t fileID, const char* name);
+    FL_PacketTable(hid_t fileID, const char *name);
 
     /* "Open" Constructor - will be deprecated because of char* name */
-    FL_PacketTable(hid_t fileID, char* name);
+    FL_PacketTable(hid_t fileID, char *name);
 
     /* Destructor
      * Cleans up the packet table
      */
-    virtual ~FL_PacketTable() {};
+    virtual ~FL_PacketTable(){};
 
     /* AppendPacket
      * Adds a single packet to the packet table.  Takes a pointer
      * to the location of the data in memory.
      * Returns 0 on success, negative on failure
      */
-    int AppendPacket(void * data);
+    int AppendPacket(void *data);
 
     /* AppendPackets (multiple packets)
      * Adds multiple packets to the packet table.  Takes the number of packets
      * to be added and a pointer to their location in memory.
      * Returns 0 on success, -1 on failure.
      */
-    int AppendPackets(size_t numPackets, void * data);
+    int AppendPackets(size_t numPackets, void *data);
 
     /* GetPacket (indexed)
      * Gets a single packet from the packet table.  Takes the index
@@ -185,7 +185,7 @@ public:
      * to memory where the data should be stored.
      * Returns 0 on success, negative on failure
      */
-    int GetPacket(hsize_t index, void * data);
+    int GetPacket(hsize_t index, void *data);
 
     /* GetPackets (multiple packets)
      * Gets multiple packets at once, all packets between
@@ -193,7 +193,7 @@ public:
      * the memory where these packets should be stored.
      * Returns 0 on success, negative on failure.
      */
-    int GetPackets(hsize_t startIndex, hsize_t endIndex, void * data);
+    int GetPackets(hsize_t startIndex, hsize_t endIndex, void *data);
 
     /* GetNextPacket (single packet)
      * Gets the next packet in the packet table.  Takes a pointer to
@@ -201,7 +201,7 @@ public:
      * Returns 0 on success, negative on failure.  Index
      * is not advanced to the next packet on failure.
      */
-    int GetNextPacket(void * data);
+    int GetNextPacket(void *data);
 
     /* GetNextPackets (multiple packets)
      * Gets the next numPackets packets in the packet table.  Takes a
@@ -209,7 +209,7 @@ public:
      * Returns 0 on success, negative on failure.  Index
      * is not advanced on failure.
      */
-    int GetNextPackets(size_t numPackets, void * data);
+    int GetNextPackets(size_t numPackets, void *data);
 };
 
 /* Removed "#ifdef VLPT_REMOVED" block.  03/08/2016, -BMR */
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am
index 363ba3b..f10ee19 100644
--- a/hl/c++/src/Makefile.am
+++ b/hl/c++/src/Makefile.am
@@ -6,7 +6,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 ##
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index ff20853..aea6f3f 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -22,7 +22,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -406,12 +406,12 @@ AMTAR = @AMTAR@
 # AM_CFLAGS is an automake construct which should be used by Makefiles 
 # instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
 # This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
+AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ @H5_ECFLAGS@
 
 # Include src directory
 AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
 	-I$(top_srcdir)/hl/src
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ @H5_ECXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
 AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
@@ -426,6 +426,7 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
 CFLAGS = @CFLAGS@
+CLANG_SANITIZE_CHECKS = @CLANG_SANITIZE_CHECKS@
 CLEARFILEBUF = @CLEARFILEBUF@
 CODESTACK = @CODESTACK@
 CONFIG_DATE = @CONFIG_DATE@
@@ -444,6 +445,7 @@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
+DEV_WARNINGS = @DEV_WARNINGS@
 DIRECT_VFD = @DIRECT_VFD@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
@@ -471,6 +473,8 @@ GREP = @GREP@
 H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
+H5_ECFLAGS = @H5_ECFLAGS@
+H5_ECXXFLAGS = @H5_ECXXFLAGS@
 H5_FCFLAGS = @H5_FCFLAGS@
 H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
 H5_LDFLAGS = @H5_LDFLAGS@
@@ -478,9 +482,12 @@ H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
+HAVE_LIBHDFS = @HAVE_LIBHDFS@
 HAVE_PTHREAD = @HAVE_PTHREAD@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_TESTS = @HDF5_TESTS@
+HDF5_TOOLS = @HDF5_TOOLS@
 HDF_CXX = @HDF_CXX@
 HDF_FORTRAN = @HDF_FORTRAN@
 HDF_FORTRAN2003 = @HDF_FORTRAN2003@
@@ -496,6 +503,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTRUMENT = @INSTRUMENT@
 INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
+JNI_LDFLAGS = @JNI_LDFLAGS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -517,6 +525,7 @@ NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
 OBJEXT = @OBJEXT@
+OPTIMIZATION = @OPTIMIZATION@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -529,8 +538,10 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PARALLEL = @PARALLEL@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
+PROFILING = @PROFILING@
 RANLIB = @RANLIB@
 ROOT = @ROOT@
+ROS3_VFD = @ROS3_VFD@
 RUNPARALLEL = @RUNPARALLEL@
 RUNSERIAL = @RUNSERIAL@
 R_INTEGER = @R_INTEGER@
@@ -544,6 +555,7 @@ STATIC_EXEC = @STATIC_EXEC@
 STATIC_SHARED = @STATIC_SHARED@
 STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
 STRIP = @STRIP@
+SYMBOLS = @SYMBOLS@
 TESTPARALLEL = @TESTPARALLEL@
 THREADSAFE = @THREADSAFE@
 TIME = @TIME@
@@ -585,6 +597,7 @@ docdir = $(exec_prefix)/doc
 dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
+examplesdir = @examplesdir@
 exec_prefix = @exec_prefix@
 fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
@@ -673,26 +686,26 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 # See libtool versioning documentation online.
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
-LT_VERS_INTERFACE = 13
-LT_VERS_REVISION = 2
-LT_VERS_AGE = 3
+LT_VERS_INTERFACE = 14
+LT_VERS_REVISION = 0
+LT_VERS_AGE = 4
 LT_CXX_VERS_INTERFACE = 16
-LT_CXX_VERS_REVISION = 0
+LT_CXX_VERS_REVISION = 1
 LT_CXX_VERS_AGE = 0
 LT_F_VERS_INTERFACE = 10
-LT_F_VERS_REVISION = 6
+LT_F_VERS_REVISION = 7
 LT_F_VERS_AGE = 0
 LT_HL_VERS_INTERFACE = 12
-LT_HL_VERS_REVISION = 2
+LT_HL_VERS_REVISION = 3
 LT_HL_VERS_AGE = 2
 LT_HL_CXX_VERS_INTERFACE = 12
-LT_HL_CXX_VERS_REVISION = 2
+LT_HL_CXX_VERS_REVISION = 3
 LT_HL_CXX_VERS_AGE = 1
 LT_HL_F_VERS_INTERFACE = 10
-LT_HL_F_VERS_REVISION = 5
+LT_HL_F_VERS_REVISION = 6
 LT_HL_F_VERS_AGE = 0
 LT_TOOLS_VERS_INTERFACE = 10
-LT_TOOLS_VERS_REVISION = 7
+LT_TOOLS_VERS_REVISION = 8
 LT_TOOLS_VERS_AGE = 0
 
 # This is our main target
@@ -711,11 +724,11 @@ libhdf5_hl_cpp_la_LIBADD = $(LIBH5_HL) $(LIBH5CPP)
 # Public headers
 include_HEADERS = H5PacketTable.h
 
-# Automake needs to be taught how to build lib, dyn, progs, and tests targets.
+# Automake needs to be taught how to build lib, progs and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
 # EXTRA_TEST variables are supplied to allow the user to force targets to
-# be built at certain times. 
+# be built at certain times.
 LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
       $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
 
@@ -1230,6 +1243,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
 
 help:
 	@$(top_srcdir)/bin/makehelp
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 build-lib: $(LIB)
@@ -1265,7 +1279,7 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS)
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
 # UPDATE: docs no longer reside in this build tree, so this target
-# is depreciated.
+# is deprecated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -1426,7 +1440,7 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
 	         "by default.";                                               \
-	    echo "Set HDF5_PARAPREFIX to use another directory. E.g.,";       \
+	    echo "Set HDF5_PARAPREFIX to use another directory. e.g.,";       \
 	    echo "    HDF5_PARAPREFIX=/PFS/user/me";                          \
 	    echo "    export HDF5_PARAPREFIX";                                \
 	    echo "    make check";                                            \