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>
author: Larry Knox <lrknox@hdfgroup.org> 2021-02-08 16:56:16 (GMT)
committer: GitHub <noreply@github.com> 2021-02-08 16:56:16 (GMT)
commit: 22c67ff6570f16050f0a5654cf1c84df917bb598 (patch)
tree: 38fb63aa498b250c2543fe7e22a511706de96a42 /c++/examples
parent: 551f15f8ae02ca9c995619b216121081eb07633e (diff)
download: hdf5-hdf5-1_8_22.zip
hdf5-hdf5-1_8_22.tar.gz
hdf5-hdf5-1_8_22.tar.bz2
22 files changed, 1275 insertions, 1274 deletions
diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt
index 22ecb19..c50315f 100644
--- a/c++/examples/CMakeLists.txt
+++ b/c++/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required (VERSION 3.10)
-PROJECT (HDF5_CPP_EXAMPLES)
+cmake_minimum_required (VERSION 3.12)
+project (HDF5_CPP_EXAMPLES CXX)
 
 # --------------------------------------------------------------------
 # Notes: When creating examples they should be prefixed
@@ -34,18 +34,54 @@ set (tutr_examples
 
 foreach (example ${examples})
   add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
-  TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
-  target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_include_directories (cpp_ex_${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (cpp_ex_${example} SHARED)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+    if (MINGW AND HDF5_MINGW_STATIC_GCC_LIBS)
+      target_link_options (${HDF5_CPP_LIBSH_TARGET}
+          PRIVATE -static-libgcc -static-libstdc++
+      )
+    endif ()
+  endif ()
   set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_CPP_EXAMPLES_${example}_FORMAT cpp_ex_${example})
+  endif ()
 endforeach ()
 
 foreach (example ${tutr_examples})
   add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
-  TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
-  target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_include_directories (cpp_ex_${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  if (NOT BUILD_SHARED_LIBS)
+    TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+  else ()
+    TARGET_C_PROPERTIES (cpp_ex_${example} SHARED)
+    target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+    if (MINGW AND HDF5_MINGW_STATIC_GCC_LIBS)
+      target_link_options (${HDF5_CPP_LIBSH_TARGET}
+          PRIVATE -static-libgcc -static-libstdc++
+      )
+    endif ()
+  endif ()
   set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
+
+  #-----------------------------------------------------------------------------
+  # Add Target to clang-format
+  #-----------------------------------------------------------------------------
+  if (HDF5_ENABLE_FORMATTERS)
+    clang_format (HDF5_CPP_EXAMPLES_${example}_FORMAT cpp_ex_${example})
+  endif ()
 endforeach ()
 
-if (BUILD_TESTING)
+if (BUILD_TESTING AND HDF5_TEST_CPP AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   include (CMakeTests.cmake)
 endif ()
diff --git a/c++/examples/CMakeTests.cmake b/c++/examples/CMakeTests.cmake
index bd1f95b..a7fc9b8 100644
--- a/c++/examples/CMakeTests.cmake
+++ b/c++/examples/CMakeTests.cmake
@@ -5,7 +5,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.
 #
@@ -16,81 +16,79 @@
 ##############################################################################
 ##############################################################################
   # Remove any output file left over from previous test run
-  add_test (
-      NAME CPP_ex-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          Group.h5
-          SDS.h5
-          SDScompound.h5
-          SDSextendible.h5
-          Select.h5
-  )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (CPP_ex-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "CPP_ex-clear-objects")
+add_test (
+    NAME CPP_ex-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove
+             Group.h5
+             SDS.h5
+             SDScompound.h5
+             SDSextendible.h5
+             Select.h5
+)
+set_tests_properties (CPP_ex-clear-objects PROPERTIES FIXTURES_SETUP clear_cppex)
 
-  foreach (example ${examples})
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
-    else ()
-      add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
-          -D "TEST_ARGS:STRING="
-          -D "TEST_EXPECT=0"
-          -D "TEST_SKIP_COMPARE=TRUE"
-          -D "TEST_OUTPUT=cpp_ex_${example}.txt"
-          #-D "TEST_REFERENCE=cpp_ex_${example}.out"
-          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-    endif ()
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "CPP_ex_${example}")
-  endforeach ()
+foreach (example ${examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
+  else ()
+    add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=cpp_ex_${example}.txt"
+        #-D "TEST_REFERENCE=cpp_ex_${example}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex)
+  if (last_test)
+    set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
+  endif ()
+  set (last_test "CPP_ex_${example}")
+endforeach ()
 #the following dependencies are handled by the order of the files
 #  SET_TESTS_PROPERTIES(CPP_ex_readdata PROPERTIES DEPENDS CPP_ex_create)
 #  SET_TESTS_PROPERTIES(CPP_ex_chunks PROPERTIES DEPENDS CPP_ex_extend_ds)
 
-  add_test (
-      NAME CPP_ex_tutr-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          h5tutr_cmprss.h5
-          h5tutr_dset.h5
-          h5tutr_extend.h5
-          h5tutr_group.h5
-          h5tutr_groups.h5
-          h5tutr_subset.h5
-  )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
-  endif ()
-  set (last_test "CPP_ex_tutr-clear-objects")
+add_test (
+    NAME CPP_ex_tutr-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove
+            h5tutr_cmprss.h5
+            h5tutr_dset.h5
+            h5tutr_extend.h5
+            h5tutr_group.h5
+            h5tutr_groups.h5
+            h5tutr_subset.h5
+)
+set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES FIXTURES_SETUP clear_cppex_tutr)
 
-  foreach (example ${tutr_examples})
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME CPP_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
-    else ()
-      add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
-          -D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
-          -D "TEST_ARGS:STRING="
-          -D "TEST_EXPECT=0"
-          -D "TEST_SKIP_COMPARE=TRUE"
-          -D "TEST_OUTPUT=cpp_ex_${example}.txt"
-          #-D "TEST_REFERENCE=cpp_ex_${example}.out"
-          -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-          -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-    endif ()
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
-    endif ()
-    set (last_test "CPP_ex_${example}")
-  endforeach ()
+foreach (example ${tutr_examples})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    add_test (NAME CPP_ex_${example} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cpp_ex_${example}>)
+  else ()
+    add_test (NAME CPP_ex_${example} COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:cpp_ex_${example}>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_SKIP_COMPARE=TRUE"
+        -D "TEST_OUTPUT=cpp_ex_${example}.txt"
+        #-D "TEST_REFERENCE=cpp_ex_${example}.out"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+  endif ()
+  set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex_tutr)
+  if (last_test)
+    set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
+  endif ()
+  set (last_test "CPP_ex_${example}")
+endforeach ()
 #the following dependencies are handled by the order of the files
 #  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtatt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
 #  SET_TESTS_PROPERTIES(CPP_ex_h5tutr_rdwt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index 51ab8e3..b7d3b04 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/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.
 ##
@@ -49,8 +49,8 @@ CXX_API=yes
 
 # Where to install examples
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
-EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples
+EXAMPLEDIR=$(examplesdir)/c++
+EXAMPLETOPDIR=$(examplesdir)
 
 # How to build programs using h5c++
 $(EXTRA_PROG): $(H5CPP)
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 1bd5fb1..40d4d7c 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/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.
 #
@@ -353,9 +353,9 @@ 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@
 AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@
-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@
@@ -370,6 +370,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@
@@ -388,6 +389,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@
@@ -415,6 +417,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@
@@ -422,9 +426,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@
@@ -440,6 +447,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@
@@ -461,6 +469,7 @@ NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
 OBJEXT = @OBJEXT@
+OPTIMIZATION = @OPTIMIZATION@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -473,8 +482,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@
@@ -488,6 +499,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@
@@ -529,6 +541,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@
@@ -637,8 +650,8 @@ CXX_API = yes
 
 # Where to install examples
 # Note: no '/' after DESTDIR.  Explanation in commence.am
-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
-EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
+EXAMPLEDIR = $(examplesdir)/c++
+EXAMPLETOPDIR = $(examplesdir)
 
 # Assume that all tests in this directory are examples, and tell
 # conclude.am when to build them.
@@ -648,11 +661,11 @@ EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
 MOSTLYCLEANFILES = *.raw *.meta *.o
 CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
 
-# 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)
 
@@ -1132,6 +1145,7 @@ installcheck-local:
 	    (cd $(EXAMPLEDIR);                                                           \
 	     /bin/sh ./$(TEST_EXAMPLES_SCRIPT);)                                                   \
 	fi
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 build-lib: $(LIB)
@@ -1167,7 +1181,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."
 
@@ -1328,7 +1342,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";                                            \
diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp
index ba2c089..25490ec 100644
--- a/c++/examples/chunks.cpp
+++ b/c++/examples/chunks.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -25,31 +25,31 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string FILE_NAME( "SDSextendible.h5" );
-const H5std_string DATASET_NAME( "ExtendibleArray" );
-const int      NX = 10;
-const int      NY = 5;
-const int      RANK = 2;
-const int      RANKC = 1;
+const H5std_string FILE_NAME("SDSextendible.h5");
+const H5std_string DATASET_NAME("ExtendibleArray");
+const int          NX    = 10;
+const int          NY    = 5;
+const int          RANK  = 2;
+const int          RANKC = 1;
 
-int main (void)
+int
+main(void)
 {
-    hsize_t     i, j;
+    hsize_t i, j;
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         /*
          * Turn off the auto-printing when failure occurs so that we can
          * handle the errors appropriately
@@ -59,8 +59,8 @@ int main (void)
         /*
          * Open the file and the dataset.
          */
-        H5File file( FILE_NAME, H5F_ACC_RDONLY );
-        DataSet dataset = file.openDataSet( DATASET_NAME );
+        H5File  file(FILE_NAME, H5F_ACC_RDONLY);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
 
         /*
          * Get filespace for rank and dimension
@@ -75,10 +75,9 @@ int main (void)
         /*
          * Get and print the dimension sizes of the file dataspace
          */
-        hsize_t dims[2];        // dataset dimensions
-        rank = filespace.getSimpleExtentDims( dims );
-        cout << "dataset rank = " << rank << ", dimensions "
-             << (unsigned long)(dims[0]) << " x "
+        hsize_t dims[2]; // dataset dimensions
+        rank = filespace.getSimpleExtentDims(dims);
+        cout << "dataset rank = " << rank << ", dimensions " << (unsigned long)(dims[0]) << " x "
              << (unsigned long)(dims[1]) << endl;
 
         /*
@@ -89,13 +88,12 @@ int main (void)
         /*
          * Read dataset back and display.
          */
-        int data_out[NX][NY];  // buffer for dataset to be read
-        dataset.read( data_out, PredType::NATIVE_INT, mspace1, filespace );
+        int data_out[NX][NY]; // buffer for dataset to be read
+        dataset.read(data_out, PredType::NATIVE_INT, mspace1, filespace);
 
         cout << "\n";
         cout << "Dataset: \n";
-        for (j = 0; j < dims[0]; j++)
-        {
+        for (j = 0; j < dims[0]; j++) {
             for (i = 0; i < dims[1]; i++)
                 cout << data_out[j][i] << " ";
             cout << endl;
@@ -125,20 +123,20 @@ int main (void)
          */
         hsize_t col_dims[1];
         col_dims[0] = 10;
-        DataSpace mspace2( RANKC, col_dims );
+        DataSpace mspace2(RANKC, col_dims);
 
         /*
          * Define the column (hyperslab) to read.
          */
-        hsize_t offset[2] = { 0, 2 };
-        hsize_t  count[2] = { 10, 1 };
-        int column[10];  // buffer for column to be read
+        hsize_t offset[2] = {0, 2};
+        hsize_t count[2]  = {10, 1};
+        int     column[10]; // buffer for column to be read
 
         /*
          * Define hyperslab and read.
          */
-        filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
-        dataset.read( column, PredType::NATIVE_INT, mspace2, filespace );
+        filespace.selectHyperslab(H5S_SELECT_SET, count, offset);
+        dataset.read(column, PredType::NATIVE_INT, mspace2, filespace);
 
         cout << endl;
         cout << "Third column: " << endl;
@@ -169,20 +167,18 @@ int main (void)
          */
         hsize_t chunk_dims[2];
         int     rank_chunk;
-        if( H5D_CHUNKED == cparms.getLayout() )
-        {
+        if (H5D_CHUNKED == cparms.getLayout()) {
             /*
              * Get chunking information: rank and dimensions
              */
-            rank_chunk = cparms.getChunk( 2, chunk_dims);
-            cout << "chunk rank " << rank_chunk << "dimensions "
-                << (unsigned long)(chunk_dims[0]) << " x "
-                << (unsigned long)(chunk_dims[1]) << endl;
+            rank_chunk = cparms.getChunk(2, chunk_dims);
+            cout << "chunk rank " << rank_chunk << "dimensions " << (unsigned long)(chunk_dims[0]) << " x "
+                 << (unsigned long)(chunk_dims[1]) << endl;
 
             /*
              * Define the memory space to read a chunk.
              */
-            DataSpace mspace3( rank_chunk, chunk_dims );
+            DataSpace mspace3(rank_chunk, chunk_dims);
 
             /*
              * Define chunk in the file (hyperslab) to read.
@@ -191,17 +187,16 @@ int main (void)
             offset[1] = 0;
             count[0]  = chunk_dims[0];
             count[1]  = chunk_dims[1];
-            filespace.selectHyperslab( H5S_SELECT_SET, count, offset );
+            filespace.selectHyperslab(H5S_SELECT_SET, count, offset);
 
             /*
              * Read chunk back and display.
              */
-            int chunk_out[2][5];   // buffer for chunk to be read
-            dataset.read( chunk_out, PredType::NATIVE_INT, mspace3, filespace );
+            int chunk_out[2][5]; // buffer for chunk to be read
+            dataset.read(chunk_out, PredType::NATIVE_INT, mspace3, filespace);
             cout << endl;
             cout << "Chunk:" << endl;
-            for (j = 0; j < chunk_dims[0]; j++)
-            {
+            for (j = 0; j < chunk_dims[0]; j++) {
                 for (i = 0; i < chunk_dims[1]; i++)
                     cout << chunk_out[j][i] << " ";
                 cout << endl;
@@ -212,25 +207,22 @@ int main (void)
              *   2 0 0 0 0
              */
         }
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch( FileIException error )
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch( DataSetIException error )
-    {
+    catch (DataSetIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch( DataSpaceIException error )
-    {
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
     }
diff --git a/c++/examples/compound.cpp b/c++/examples/compound.cpp
index 284ce16..eb67b61 100644
--- a/c++/examples/compound.cpp
+++ b/c++/examples/compound.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -26,186 +26,181 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string FILE_NAME( "SDScompound.h5" );
-const H5std_string DATASET_NAME( "ArrayOfStructures" );
-const H5std_string MEMBER1( "a_name" );
-const H5std_string MEMBER2( "b_name" );
-const H5std_string MEMBER3( "c_name" );
-const int   LENGTH = 10;
-const int   RANK = 1;
+const H5std_string FILE_NAME("SDScompound.h5");
+const H5std_string DATASET_NAME("ArrayOfStructures");
+const H5std_string MEMBER1("a_name");
+const H5std_string MEMBER2("b_name");
+const H5std_string MEMBER3("c_name");
+const int          LENGTH = 10;
+const int          RANK   = 1;
 
-int main(void)
+int
+main(void)
 {
-   /* First structure  and dataset*/
-   typedef struct s1_t {
+    /* First structure  and dataset*/
+    typedef struct s1_t {
         int    a;
         float  b;
         double c;
-   } s1_t;
+    } s1_t;
 
-   /* Second structure (subset of s1_t)  and dataset*/
-   typedef struct s2_t {
+    /* Second structure (subset of s1_t)  and dataset*/
+    typedef struct s2_t {
         double c;
         int    a;
-   } s2_t;
-
-   // Try block to detect exceptions raised by any of the calls inside it
-   try
-   {
-      /*
-       * Initialize the data
-       */
-      int  i;
-      s1_t s1[LENGTH];
-      for (i = 0; i< LENGTH; i++)
-      {
-         s1[i].a = i;
-         s1[i].b = i*i;
-         s1[i].c = 1./(i+1);
-      }
-
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Create the data space.
-       */
-      hsize_t dim[] = {LENGTH};   /* Dataspace dimensions */
-      DataSpace space( RANK, dim );
-
-      /*
-       * Create the file.
-       */
-      H5File* file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
-
-      /*
-       * Create the memory datatype.
-       */
-      CompType mtype1( sizeof(s1_t) );
-      mtype1.insertMember( MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
-      mtype1.insertMember( MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_DOUBLE);
-      mtype1.insertMember( MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_FLOAT);
-
-      /*
-       * Create the dataset.
-       */
-      DataSet* dataset;
-      dataset = new DataSet(file->createDataSet(DATASET_NAME, mtype1, space));
-
-      /*
-       * Write data to the dataset;
-       */
-      dataset->write( s1, mtype1 );
-
-      /*
-       * Release resources
-       */
-      delete dataset;
-      delete file;
-
-      /*
-       * Open the file and the dataset.
-       */
-      file = new H5File( FILE_NAME, H5F_ACC_RDONLY );
-      dataset = new DataSet (file->openDataSet( DATASET_NAME ));
-
-      /*
-       * Create a datatype for s2
-       */
-      CompType mtype2( sizeof(s2_t) );
-
-      mtype2.insertMember( MEMBER3, HOFFSET(s2_t, c), PredType::NATIVE_DOUBLE);
-      mtype2.insertMember( MEMBER1, HOFFSET(s2_t, a), PredType::NATIVE_INT);
-
-      /*
-       * Read two fields c and a from s1 dataset. Fields in the file
-       * are found by their names "c_name" and "a_name".
-       */
-      s2_t s2[LENGTH];
-      dataset->read( s2, mtype2 );
-
-      /*
-       * Display the fields
-       */
-      cout << endl << "Field c : " << endl;
-      for( i = 0; i < LENGTH; i++)
-         cout << s2[i].c << " ";
-      cout << endl;
-
-      cout << endl << "Field a : " << endl;
-      for( i = 0; i < LENGTH; i++)
-         cout << s2[i].a << " ";
-      cout << endl;
-
-      /*
-       * Create a datatype for s3.
-       */
-      CompType mtype3( sizeof(float) );
-
-      mtype3.insertMember( MEMBER2, 0, PredType::NATIVE_FLOAT);
-
-      /*
-       * Read field b from s1 dataset. Field in the file is found by its name.
-       */
-      float s3[LENGTH];  // Third "structure" - used to read float field of s1
-      dataset->read( s3, mtype3 );
-
-      /*
-       * Display the field
-       */
-      cout << endl << "Field b : " << endl;
-      for( i = 0; i < LENGTH; i++)
-         cout << s3[i] << " ";
-      cout << endl;
-
-      /*
-       * Release resources
-       */
-      delete dataset;
-      delete file;
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   return 0;
+    } s2_t;
+
+    // Try block to detect exceptions raised by any of the calls inside it
+    try {
+        /*
+         * Initialize the data
+         */
+        int  i;
+        s1_t s1[LENGTH];
+        for (i = 0; i < LENGTH; i++) {
+            s1[i].a = i;
+            s1[i].b = i * i;
+            s1[i].c = 1. / (i + 1);
+        }
+
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create the data space.
+         */
+        hsize_t   dim[] = {LENGTH}; /* Dataspace dimensions */
+        DataSpace space(RANK, dim);
+
+        /*
+         * Create the file.
+         */
+        H5File *file = new H5File(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Create the memory datatype.
+         */
+        CompType mtype1(sizeof(s1_t));
+        mtype1.insertMember(MEMBER1, HOFFSET(s1_t, a), PredType::NATIVE_INT);
+        mtype1.insertMember(MEMBER3, HOFFSET(s1_t, c), PredType::NATIVE_DOUBLE);
+        mtype1.insertMember(MEMBER2, HOFFSET(s1_t, b), PredType::NATIVE_FLOAT);
+
+        /*
+         * Create the dataset.
+         */
+        DataSet *dataset;
+        dataset = new DataSet(file->createDataSet(DATASET_NAME, mtype1, space));
+
+        /*
+         * Write data to the dataset;
+         */
+        dataset->write(s1, mtype1);
+
+        /*
+         * Release resources
+         */
+        delete dataset;
+        delete file;
+
+        /*
+         * Open the file and the dataset.
+         */
+        file    = new H5File(FILE_NAME, H5F_ACC_RDONLY);
+        dataset = new DataSet(file->openDataSet(DATASET_NAME));
+
+        /*
+         * Create a datatype for s2
+         */
+        CompType mtype2(sizeof(s2_t));
+
+        mtype2.insertMember(MEMBER3, HOFFSET(s2_t, c), PredType::NATIVE_DOUBLE);
+        mtype2.insertMember(MEMBER1, HOFFSET(s2_t, a), PredType::NATIVE_INT);
+
+        /*
+         * Read two fields c and a from s1 dataset. Fields in the file
+         * are found by their names "c_name" and "a_name".
+         */
+        s2_t s2[LENGTH];
+        dataset->read(s2, mtype2);
+
+        /*
+         * Display the fields
+         */
+        cout << endl << "Field c : " << endl;
+        for (i = 0; i < LENGTH; i++)
+            cout << s2[i].c << " ";
+        cout << endl;
+
+        cout << endl << "Field a : " << endl;
+        for (i = 0; i < LENGTH; i++)
+            cout << s2[i].a << " ";
+        cout << endl;
+
+        /*
+         * Create a datatype for s3.
+         */
+        CompType mtype3(sizeof(float));
+
+        mtype3.insertMember(MEMBER2, 0, PredType::NATIVE_FLOAT);
+
+        /*
+         * Read field b from s1 dataset. Field in the file is found by its name.
+         */
+        float s3[LENGTH]; // Third "structure" - used to read float field of s1
+        dataset->read(s3, mtype3);
+
+        /*
+         * Display the field
+         */
+        cout << endl << "Field b : " << endl;
+        for (i = 0; i < LENGTH; i++)
+            cout << s3[i] << " ";
+        cout << endl;
+
+        /*
+         * Release resources
+         */
+        delete dataset;
+        delete file;
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printError();
+        return -1;
+    }
+
+    return 0;
 }
diff --git a/c++/examples/create.cpp b/c++/examples/create.cpp
index 2993a0c..6062895 100644
--- a/c++/examples/create.cpp
+++ b/c++/examples/create.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -25,108 +25,102 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string      FILE_NAME( "SDS.h5" );
-const H5std_string      DATASET_NAME( "IntArray" );
-const int       NX = 5;                    // dataset dimensions
-const int       NY = 6;
-const int       RANK = 2;
+const H5std_string FILE_NAME("SDS.h5");
+const H5std_string DATASET_NAME("IntArray");
+const int          NX   = 5; // dataset dimensions
+const int          NY   = 6;
+const int          RANK = 2;
 
-int main (void)
+int
+main(void)
 {
-   /*
-    * Data initialization.
-    */
-   int i, j;
-   int data[NX][NY];          // buffer for data to write
-   for (j = 0; j < NX; j++)
-   {
-      for (i = 0; i < NY; i++)
-         data[j][i] = i + j;
-   }
-   /*
-    * 0 1 2 3 4 5
-    * 1 2 3 4 5 6
-    * 2 3 4 5 6 7
-    * 3 4 5 6 7 8
-    * 4 5 6 7 8 9
-    */
-
-   // Try block to detect exceptions raised by any of the calls inside it
-   try
-   {
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Create a new file using H5F_ACC_TRUNC access,
-       * default file creation properties, and default file
-       * access properties.
-       */
-      H5File file( FILE_NAME, H5F_ACC_TRUNC );
-
-      /*
-       * Define the size of the array and create the data space for fixed
-       * size dataset.
-       */
-      hsize_t     dimsf[2];              // dataset dimensions
-      dimsf[0] = NX;
-      dimsf[1] = NY;
-      DataSpace dataspace( RANK, dimsf );
-
-      /*
-       * Define datatype for the data in the file.
-       * We will store little endian INT numbers.
-       */
-      IntType datatype( PredType::NATIVE_INT );
-      datatype.setOrder( H5T_ORDER_LE );
-
-      /*
-       * Create a new dataset within the file using defined dataspace and
-       * datatype and default dataset creation properties.
-       */
-      DataSet dataset = file.createDataSet( DATASET_NAME, datatype, dataspace );
-
-      /*
-       * Write the data to the dataset using default memory space, file
-       * space, and transfer properties.
-       */
-      dataset.write( data, PredType::NATIVE_INT );
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   return 0;  // successfully terminated
+    /*
+     * Data initialization.
+     */
+    int i, j;
+    int data[NX][NY]; // buffer for data to write
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++)
+            data[j][i] = i + j;
+    }
+    /*
+     * 0 1 2 3 4 5
+     * 1 2 3 4 5 6
+     * 2 3 4 5 6 7
+     * 3 4 5 6 7 8
+     * 4 5 6 7 8 9
+     */
+
+    // Try block to detect exceptions raised by any of the calls inside it
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create a new file using H5F_ACC_TRUNC access,
+         * default file creation properties, and default file
+         * access properties.
+         */
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Define the size of the array and create the data space for fixed
+         * size dataset.
+         */
+        hsize_t dimsf[2]; // dataset dimensions
+        dimsf[0] = NX;
+        dimsf[1] = NY;
+        DataSpace dataspace(RANK, dimsf);
+
+        /*
+         * Define datatype for the data in the file.
+         * We will store little endian INT numbers.
+         */
+        IntType datatype(PredType::NATIVE_INT);
+        datatype.setOrder(H5T_ORDER_LE);
+
+        /*
+         * Create a new dataset within the file using defined dataspace and
+         * datatype and default dataset creation properties.
+         */
+        DataSet dataset = file.createDataSet(DATASET_NAME, datatype, dataspace);
+
+        /*
+         * Write the data to the dataset using default memory space, file
+         * space, and transfer properties.
+         */
+        dataset.write(data, PredType::NATIVE_INT);
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printError();
+        return -1;
+    }
+
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/extend_ds.cpp b/c++/examples/extend_ds.cpp
index dbedfc9..ed28dbb 100644
--- a/c++/examples/extend_ds.cpp
+++ b/c++/examples/extend_ds.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -27,212 +27,206 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string FILE_NAME( "SDSextendible.h5" );
-const H5std_string DATASET_NAME( "ExtendibleArray" );
-const int      NX = 10;
-const int      NY = 5;
-const int      RANK = 2;
+const H5std_string FILE_NAME("SDSextendible.h5");
+const H5std_string DATASET_NAME("ExtendibleArray");
+const int          NX   = 10;
+const int          NY   = 5;
+const int          RANK = 2;
 
-int main (void)
+int
+main(void)
 {
-   /*
-    * Try block to detect exceptions raised by any of the calls inside it
-    */
-   try
-   {
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Create the data space with unlimited dimensions.
-       */
-      hsize_t      dims[2]  = { 3, 3};  // dataset dimensions at creation
-      hsize_t      maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
-      DataSpace mspace1( RANK, dims, maxdims);
-
-      /*
-       * Create a new file. If file exists its contents will be overwritten.
-       */
-      H5File file( FILE_NAME, H5F_ACC_TRUNC );
-
-      /*
-       * Modify dataset creation properties, i.e. enable chunking.
-       */
-      DSetCreatPropList cparms;
-
-      hsize_t      chunk_dims[2] ={2, 5};
-      cparms.setChunk( RANK, chunk_dims );
-
-      /*
-       * Set fill value for the dataset
-       */
-      int fill_val = 0;
-      cparms.setFillValue( PredType::NATIVE_INT, &fill_val);
-
-      /*
-       * Create a new dataset within the file using cparms
-       * creation properties.
-       */
-      DataSet dataset = file.createDataSet( DATASET_NAME, PredType::NATIVE_INT, mspace1, cparms);
-
-      /*
-       * Extend the dataset. This call assures that dataset is at least 3 x 3.
-       */
-      hsize_t      size[2];
-      size[0]   = 3;
-      size[1]   = 3;
-      dataset.extend( size );
-
-      /*
-       * Select a hyperslab.
-       */
-      DataSpace fspace1 = dataset.getSpace ();
-      hsize_t     offset[2];
-      offset[0] = 0;
-      offset[1] = 0;
-      hsize_t      dims1[2] = { 3, 3};            /* data1 dimensions */
-      fspace1.selectHyperslab( H5S_SELECT_SET, dims1, offset );
-
-      /*
-       * Write the data to the hyperslab.
-       */
-      int       data1[3][3] = { {1, 1, 1},       /* data to write */
-                                {1, 1, 1},
-                                {1, 1, 1} };
-      dataset.write( data1, PredType::NATIVE_INT, mspace1, fspace1 );
-
-      /*
-       * Extend the dataset. Dataset becomes 10 x 3.
-       */
-      hsize_t   dims2[2] = { 7, 1};            /* data2 dimensions */
-      dims[0]   = dims1[0] + dims2[0];
-      size[0]   = dims[0];
-      size[1]   = dims[1];
-      dataset.extend( size );
-
-      /*
-       * Select a hyperslab.
-       */
-      DataSpace fspace2 = dataset.getSpace ();
-      offset[0] = 3;
-      offset[1] = 0;
-      fspace2.selectHyperslab( H5S_SELECT_SET, dims2, offset );
-
-      /*
-       * Define memory space
-       */
-      DataSpace mspace2( RANK, dims2 );
-
-      /*
-       * Write the data to the hyperslab.
-       */
-      int  data2[7]    = { 2, 2, 2, 2, 2, 2, 2};
-      dataset.write( data2, PredType::NATIVE_INT, mspace2, fspace2 );
-
-      /*
-       * Extend the dataset. Dataset becomes 10 x 5.
-       */
-      hsize_t   dims3[2] = { 2, 2};            /* data3 dimensions */
-      dims[1]   = dims1[1] + dims3[1];
-      size[0]   = dims[0];
-      size[1]   = dims[1];
-      dataset.extend( size );
-
-      /*
-       * Select a hyperslab
-       */
-      DataSpace fspace3 = dataset.getSpace ();
-      offset[0] = 0;
-      offset[1] = 3;
-      fspace3.selectHyperslab( H5S_SELECT_SET, dims3, offset );
-
-      /*
-       * Define memory space.
-       */
-      DataSpace mspace3( RANK, dims3 );
-
-      /*
-       * Write the data to the hyperslab.
-       */
-      int         data3[2][2] = { {3, 3}, {3, 3} };
-      dataset.write( data3, PredType::NATIVE_INT, mspace3, fspace3 );
-
-      /*
-       * Read the data from this dataset and display it.
-       */
-      int i, j;
-      int data_out[NX][NY];
-      for (i = 0; i < NX; i++)
-      {
-         for (j = 0; j < NY; j++)
-            data_out[i][j] = 0;
-      }
-      dataset.read( data_out, PredType::NATIVE_INT );
-      /*
-       * Resulting dataset
-       *
-       *         1 1 1 3 3
-       *         1 1 1 3 3
-       *         1 1 1 0 0
-       *         2 0 0 0 0
-       *         2 0 0 0 0
-       *         2 0 0 0 0
-       *         2 0 0 0 0
-       *         2 0 0 0 0
-       *         2 0 0 0 0
-       *         2 0 0 0 0
-       */
-      /*
-       * Display the result.
-       */
-      for (i=0; i < NX; i++)
-      {
-          for(j=0; j < NY; j++)
-             cout << data_out[i][j] << "  ";
-          cout << endl;
-      }
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-   return 0;
+    /*
+     * Try block to detect exceptions raised by any of the calls inside it
+     */
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Create the data space with unlimited dimensions.
+         */
+        hsize_t   dims[2]    = {3, 3}; // dataset dimensions at creation
+        hsize_t   maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
+        DataSpace mspace1(RANK, dims, maxdims);
+
+        /*
+         * Create a new file. If file exists its contents will be overwritten.
+         */
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
+
+        /*
+         * Modify dataset creation properties, i.e. enable chunking.
+         */
+        DSetCreatPropList cparms;
+
+        hsize_t chunk_dims[2] = {2, 5};
+        cparms.setChunk(RANK, chunk_dims);
+
+        /*
+         * Set fill value for the dataset
+         */
+        int fill_val = 0;
+        cparms.setFillValue(PredType::NATIVE_INT, &fill_val);
+
+        /*
+         * Create a new dataset within the file using cparms
+         * creation properties.
+         */
+        DataSet dataset = file.createDataSet(DATASET_NAME, PredType::NATIVE_INT, mspace1, cparms);
+
+        /*
+         * Extend the dataset. This call assures that dataset is at least 3 x 3.
+         */
+        hsize_t size[2];
+        size[0] = 3;
+        size[1] = 3;
+        dataset.extend(size);
+
+        /*
+         * Select a hyperslab.
+         */
+        DataSpace fspace1 = dataset.getSpace();
+        hsize_t   offset[2];
+        offset[0]        = 0;
+        offset[1]        = 0;
+        hsize_t dims1[2] = {3, 3}; /* data1 dimensions */
+        fspace1.selectHyperslab(H5S_SELECT_SET, dims1, offset);
+
+        /*
+         * Write the data to the hyperslab.
+         */
+        int data1[3][3] = {{1, 1, 1}, /* data to write */
+                           {1, 1, 1},
+                           {1, 1, 1}};
+        dataset.write(data1, PredType::NATIVE_INT, mspace1, fspace1);
+
+        /*
+         * Extend the dataset. Dataset becomes 10 x 3.
+         */
+        hsize_t dims2[2] = {7, 1}; /* data2 dimensions */
+        dims[0]          = dims1[0] + dims2[0];
+        size[0]          = dims[0];
+        size[1]          = dims[1];
+        dataset.extend(size);
+
+        /*
+         * Select a hyperslab.
+         */
+        DataSpace fspace2 = dataset.getSpace();
+        offset[0]         = 3;
+        offset[1]         = 0;
+        fspace2.selectHyperslab(H5S_SELECT_SET, dims2, offset);
+
+        /*
+         * Define memory space
+         */
+        DataSpace mspace2(RANK, dims2);
+
+        /*
+         * Write the data to the hyperslab.
+         */
+        int data2[7] = {2, 2, 2, 2, 2, 2, 2};
+        dataset.write(data2, PredType::NATIVE_INT, mspace2, fspace2);
+
+        /*
+         * Extend the dataset. Dataset becomes 10 x 5.
+         */
+        hsize_t dims3[2] = {2, 2}; /* data3 dimensions */
+        dims[1]          = dims1[1] + dims3[1];
+        size[0]          = dims[0];
+        size[1]          = dims[1];
+        dataset.extend(size);
+
+        /*
+         * Select a hyperslab
+         */
+        DataSpace fspace3 = dataset.getSpace();
+        offset[0]         = 0;
+        offset[1]         = 3;
+        fspace3.selectHyperslab(H5S_SELECT_SET, dims3, offset);
+
+        /*
+         * Define memory space.
+         */
+        DataSpace mspace3(RANK, dims3);
+
+        /*
+         * Write the data to the hyperslab.
+         */
+        int data3[2][2] = {{3, 3}, {3, 3}};
+        dataset.write(data3, PredType::NATIVE_INT, mspace3, fspace3);
+
+        /*
+         * Read the data from this dataset and display it.
+         */
+        int i, j;
+        int data_out[NX][NY];
+        for (i = 0; i < NX; i++) {
+            for (j = 0; j < NY; j++)
+                data_out[i][j] = 0;
+        }
+        dataset.read(data_out, PredType::NATIVE_INT);
+        /*
+         * Resulting dataset
+         *
+         *         1 1 1 3 3
+         *         1 1 1 3 3
+         *         1 1 1 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         *         2 0 0 0 0
+         */
+        /*
+         * Display the result.
+         */
+        for (i = 0; i < NX; i++) {
+            for (j = 0; j < NY; j++)
+                cout << data_out[i][j] << "  ";
+            cout << endl;
+        }
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printError();
+        return -1;
+    }
+    return 0;
 }
diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp
index 6e1764f..5ea2094 100644
--- a/c++/examples/h5group.cpp
+++ b/c++/examples/h5group.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -29,33 +29,32 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string FILE_NAME( "Group.h5" );
+const H5std_string FILE_NAME("Group.h5");
 const int          RANK = 2;
 
 // Operator function
-extern "C" herr_t file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo,
-    void *opdata);
+extern "C" herr_t file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata);
 
-int main(void)
+int
+main(void)
 {
 
-    hsize_t  dims[2];
-    hsize_t  cdims[2];
+    hsize_t dims[2];
+    hsize_t cdims[2];
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         /*
          * Turn off the auto-printing when failure occurs so that we can
          * handle the errors appropriately
@@ -66,12 +65,12 @@ int main(void)
          * Create the named file, truncating the existing one if any,
          * using default create and access property lists.
          */
-        H5File *file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
+        H5File *file = new H5File(FILE_NAME, H5F_ACC_TRUNC);
 
         /*
          * Create a group in the file
          */
-        Group* group = new Group( file->createGroup( "/Data" ));
+        Group *group = new Group(file->createGroup("/Data"));
 
         /*
          * Create dataset "Compressed Data" in the group using absolute
@@ -79,21 +78,20 @@ int main(void)
          * GZIP compression with the compression effort set to 6.
          * Note that compression can be used only when dataset is chunked.
          */
-        dims[0] = 1000;
-        dims[1] = 20;
-        cdims[0] = 20;
-        cdims[1] = 20;
-        DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace
-        DSetCreatPropList ds_creatplist;  // create dataset creation prop list
-        ds_creatplist.setChunk( 2, cdims );  // then modify it for compression
-        ds_creatplist.setDeflate( 6 );
+        dims[0]                     = 1000;
+        dims[1]                     = 20;
+        cdims[0]                    = 20;
+        cdims[1]                    = 20;
+        DataSpace *       dataspace = new DataSpace(RANK, dims); // create new dspace
+        DSetCreatPropList ds_creatplist;                         // create dataset creation prop list
+        ds_creatplist.setChunk(2, cdims);                        // then modify it for compression
+        ds_creatplist.setDeflate(6);
 
         /*
          * Create the first dataset.
          */
-        DataSet* dataset = new DataSet(file->createDataSet(
-                "/Data/Compressed_Data", PredType::NATIVE_INT,
-                *dataspace, ds_creatplist ));
+        DataSet *dataset = new DataSet(
+            file->createDataSet("/Data/Compressed_Data", PredType::NATIVE_INT, *dataspace, ds_creatplist));
 
         /*
          * Close the first dataset.
@@ -104,11 +102,10 @@ int main(void)
         /*
          * Create the second dataset.
          */
-        dims[0] = 500;
-        dims[1] = 20;
+        dims[0]   = 500;
+        dims[1]   = 20;
         dataspace = new DataSpace(RANK, dims); // create second dspace
-        dataset = new DataSet(file->createDataSet("/Data/Float_Data",
-                        PredType::NATIVE_FLOAT, *dataspace));
+        dataset   = new DataSet(file->createDataSet("/Data/Float_Data", PredType::NATIVE_FLOAT, *dataspace));
 
         delete dataset;
         delete dataspace;
@@ -118,16 +115,16 @@ int main(void)
         /*
          * Now reopen the file and group in the file.
          */
-        file = new H5File(FILE_NAME, H5F_ACC_RDWR);
+        file  = new H5File(FILE_NAME, H5F_ACC_RDWR);
         group = new Group(file->openGroup("Data"));
 
         /*
          * Access "Compressed_Data" dataset in the group.
          */
-        try {  // to determine if the dataset exists in the group
-            dataset = new DataSet( group->openDataSet( "Compressed_Data" ));
+        try { // to determine if the dataset exists in the group
+            dataset = new DataSet(group->openDataSet("Compressed_Data"));
         }
-        catch( GroupIException not_found_error ) {
+        catch (GroupIException not_found_error) {
             cout << " Dataset is not found." << endl;
         }
         cout << "dataset \"/Data/Compressed_Data\" is open" << endl;
@@ -140,17 +137,16 @@ int main(void)
         /*
          * Create hard link to the Data group.
          */
-        file->link( H5L_TYPE_HARD, "Data", "Data_new" );
+        file->link(H5L_TYPE_HARD, "Data", "Data_new");
 
         /*
          * We can access "Compressed_Data" dataset using created
          * hard link "Data_new".
          */
-        try {  // to determine if the dataset exists in the file
-            dataset = new DataSet(file->openDataSet( "/Data_new/Compressed_Data" ));
+        try { // to determine if the dataset exists in the file
+            dataset = new DataSet(file->openDataSet("/Data_new/Compressed_Data"));
         }
-        catch( FileIException not_found_error )
-        {
+        catch (FileIException not_found_error) {
             cout << " Dataset is not found." << endl;
         }
         cout << "dataset \"/Data_new/Compressed_Data\" is open" << endl;
@@ -173,11 +169,10 @@ int main(void)
          * of the objects in the file root direvtory.
          */
         cout << "Unlinking..." << endl;
-        try {  // attempt to unlink the dataset
-            file->unlink( "Data" );
+        try { // attempt to unlink the dataset
+            file->unlink("Data");
         }
-        catch( FileIException unlink_error )
-        {
+        catch (FileIException unlink_error) {
             cout << " unlink failed." << endl;
         }
         cout << "\"Data\" is unlinked" << endl;
@@ -191,32 +186,28 @@ int main(void)
          */
         delete group;
         delete file;
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch( FileIException error )
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch( DataSetIException error )
-    {
+    catch (DataSetIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch( DataSpaceIException error )
-    {
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the Attribute operations
-    catch( AttributeIException error )
-    {
+    catch (AttributeIException error) {
         error.printError();
         return -1;
     }
@@ -244,4 +235,3 @@ file_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata)
     H5Gclose(group);
     return 0;
 }
-
diff --git a/c++/examples/h5tutr_cmprss.cpp b/c++/examples/h5tutr_cmprss.cpp
index 32f67ad..e6a1a6e 100644
--- a/c++/examples/h5tutr_cmprss.cpp
+++ b/c++/examples/h5tutr_cmprss.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,39 +22,39 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
-const H5std_string      FILE_NAME("h5tutr_cmprss.h5");
-const H5std_string      DATASET_NAME("Compressed_Data");
-const int       DIM0 = 100;
-const int       DIM1 = 20;
+const H5std_string FILE_NAME("h5tutr_cmprss.h5");
+const H5std_string DATASET_NAME("Compressed_Data");
+const int          DIM0 = 100;
+const int          DIM1 = 20;
 
-int main (void)
+int
+main(void)
 {
-    hsize_t dims[2] = { DIM0, DIM1 };   // dataset dimensions
-    hsize_t chunk_dims[2] = { 20, 20 }; // chunk dimensions
-    int     i,j, buf[DIM0][DIM1];
+    hsize_t dims[2]       = {DIM0, DIM1}; // dataset dimensions
+    hsize_t chunk_dims[2] = {20, 20};     // chunk dimensions
+    int     i, j, buf[DIM0][DIM1];
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
-        // Create a new file using the default property lists. 
+        // Create a new file using the default property lists.
         H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
         // Create the data space for the dataset.
         DataSpace *dataspace = new DataSpace(2, dims);
 
         // Modify dataset creation property to enable chunking
-        DSetCreatPropList  *plist = new  DSetCreatPropList;
+        DSetCreatPropList *plist = new DSetCreatPropList;
         plist->setChunk(2, chunk_dims);
 
         // Set ZLIB (DEFLATE) Compression using level 6.
@@ -65,14 +65,14 @@ int main (void)
         // unsigned szip_options_mask = H5_SZIP_NN_OPTION_MASK;
         // unsigned szip_pixels_per_block = 16;
         // plist->setSzip(szip_options_mask, szip_pixels_per_block);
-     
-        // Create the dataset.      
-        DataSet *dataset = new DataSet(file.createDataSet( DATASET_NAME, 
-                                PredType::STD_I32BE, *dataspace, *plist) );
 
-        for (i = 0; i< DIM0; i++)
-          for (j=0; j<DIM1; j++)
-              buf[i][j] = i+j;
+        // Create the dataset.
+        DataSet *dataset =
+            new DataSet(file.createDataSet(DATASET_NAME, PredType::STD_I32BE, *dataspace, *plist));
+
+        for (i = 0; i < DIM0; i++)
+            for (j = 0; j < DIM1; j++)
+                buf[i][j] = i + j;
 
         // Write data to dataset.
         dataset->write(buf, PredType::NATIVE_INT);
@@ -84,77 +84,73 @@ int main (void)
         file.close();
 
         // -----------------------------------------------
-        // Re-open the file and dataset, retrieve filter 
+        // Re-open the file and dataset, retrieve filter
         // information for dataset and read the data back.
         // -----------------------------------------------
-        
-        int        rbuf[DIM0][DIM1];
-        int        numfilt;
-        size_t     nelmts={1}, namelen={1};
-        unsigned  flags, filter_info, cd_values[1], idx;
-        char       name[1];
+
+        int          rbuf[DIM0][DIM1];
+        int          numfilt;
+        size_t       nelmts = {1}, namelen = {1};
+        unsigned     flags, filter_info, cd_values[1], idx;
+        char         name[1];
         H5Z_filter_t filter_type;
 
         // Open the file and the dataset in the file.
         file.openFile(FILE_NAME, H5F_ACC_RDONLY);
-        dataset = new DataSet(file.openDataSet( DATASET_NAME));
+        dataset = new DataSet(file.openDataSet(DATASET_NAME));
 
         // Get the create property list of the dataset.
-        plist = new DSetCreatPropList(dataset->getCreatePlist ());
+        plist = new DSetCreatPropList(dataset->getCreatePlist());
 
         // Get the number of filters associated with the dataset.
         numfilt = plist->getNfilters();
         cout << "Number of filters associated with dataset: " << numfilt << endl;
 
-        for (idx=0; idx < numfilt; idx++) {
+        for (idx = 0; idx < numfilt; idx++) {
             nelmts = 0;
 
-            filter_type = plist->getFilter(idx, flags, nelmts, cd_values, namelen, name , filter_info);
+            filter_type = plist->getFilter(idx, flags, nelmts, cd_values, namelen, name, filter_info);
 
             cout << "Filter Type: ";
 
             switch (filter_type) {
-              case H5Z_FILTER_DEFLATE:
-                   cout << "H5Z_FILTER_DEFLATE" << endl;
-                   break;
-              case H5Z_FILTER_SZIP:
-                   cout << "H5Z_FILTER_SZIP" << endl; 
-                   break;
-              default:
-                   cout << "Other filter type included." << endl;
-              }
+                case H5Z_FILTER_DEFLATE:
+                    cout << "H5Z_FILTER_DEFLATE" << endl;
+                    break;
+                case H5Z_FILTER_SZIP:
+                    cout << "H5Z_FILTER_SZIP" << endl;
+                    break;
+                default:
+                    cout << "Other filter type included." << endl;
+            }
         }
 
         // Read data.
         dataset->read(rbuf, PredType::NATIVE_INT);
 
-        delete plist; 
+        delete plist;
         delete dataset;
-        file.close();   // can be skipped
+        file.close(); // can be skipped
 
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
+    catch (DataSetIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_crtatt.cpp b/c++/examples/h5tutr_crtatt.cpp
index bdc2fc5..a83826b 100644
--- a/c++/examples/h5tutr_crtatt.cpp
+++ b/c++/examples/h5tutr_crtatt.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,72 +22,65 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string      FILE_NAME( "h5tutr_dset.h5" );
-const H5std_string      DATASET_NAME( "dset" );
-const H5std_string      ATTR_NAME( "Units" );
+const H5std_string FILE_NAME("h5tutr_dset.h5");
+const H5std_string DATASET_NAME("dset");
+const H5std_string ATTR_NAME("Units");
 
-const int       DIM1 = 2;
+const int DIM1 = 2;
 
-int main (void)
+int
+main(void)
 {
-   int attr_data[2] = { 100, 200};
-   hsize_t dims[1] = { DIM1 };
-   
+    int     attr_data[2] = {100, 200};
+    hsize_t dims[1]      = {DIM1};
 
-   // Try block to detect exceptions raised by any of the calls inside it
-   try
-   {
+    // Try block to detect exceptions raised by any of the calls inside it
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
         // Open an existing file and dataset.
-        H5File file( FILE_NAME, H5F_ACC_RDWR );
-        DataSet dataset = file.openDataSet( DATASET_NAME );
+        H5File  file(FILE_NAME, H5F_ACC_RDWR);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
 
         // Create the data space for the attribute.
-        DataSpace attr_dataspace = DataSpace (1, dims );
+        DataSpace attr_dataspace = DataSpace(1, dims);
 
-        // Create a dataset attribute. 
-        Attribute attribute = dataset.createAttribute( ATTR_NAME, PredType::STD_I32BE, 
-                                                  attr_dataspace);
-     
-        // Write the attribute data. 
-        attribute.write( PredType::NATIVE_INT, attr_data);
+        // Create a dataset attribute.
+        Attribute attribute = dataset.createAttribute(ATTR_NAME, PredType::STD_I32BE, attr_dataspace);
 
-   }  // end of try block
+        // Write the attribute data.
+        attribute.write(PredType::NATIVE_INT, attr_data);
 
-   // catch failure caused by the H5File operations
-   catch( DataSpaceIException error )
-   {
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
-   }
+    }
 
-   // catch failure caused by the H5File operations
-   catch( AttributeIException error )
-   {
+    // catch failure caused by the H5File operations
+    catch (AttributeIException error) {
         error.printError();
         return -1;
-   }
+    }
 
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
         error.printError();
         return -1;
-   }
+    }
 
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
         error.printError();
         return -1;
-   }
+    }
 
-   return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_crtdat.cpp b/c++/examples/h5tutr_crtdat.cpp
index 9fed595..a2fd3d6 100644
--- a/c++/examples/h5tutr_crtdat.cpp
+++ b/c++/examples/h5tutr_crtdat.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,59 +22,55 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string      FILE_NAME("h5tutr_dset.h5");
-const H5std_string      DATASET_NAME("dset");
-const int        NX = 4;                     // dataset dimensions
-const int        NY = 6;
-const int        RANK = 2;
+const H5std_string FILE_NAME("h5tutr_dset.h5");
+const H5std_string DATASET_NAME("dset");
+const int          NX   = 4; // dataset dimensions
+const int          NY   = 6;
+const int          RANK = 2;
 
-int main (void)
+int
+main(void)
 {
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
-        // Create a new file using the default property lists. 
+        // Create a new file using the default property lists.
         H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
         // Create the data space for the dataset.
-        hsize_t dims[2];               // dataset dimensions
+        hsize_t dims[2]; // dataset dimensions
         dims[0] = NX;
         dims[1] = NY;
         DataSpace dataspace(RANK, dims);
 
-        // Create the dataset.      
+        // Create the dataset.
         DataSet dataset = file.createDataSet(DATASET_NAME, PredType::STD_I32BE, dataspace);
 
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
+    catch (DataSetIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_crtgrp.cpp b/c++/examples/h5tutr_crtgrp.cpp
index cee306c..236e26b 100644
--- a/c++/examples/h5tutr_crtgrp.cpp
+++ b/c++/examples/h5tutr_crtgrp.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,46 +22,44 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 const H5std_string FILE_NAME("h5tutr_group.h5");
 
-int main(void)
+int
+main(void)
 {
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
         // Create a new file using default property lists.
         H5File file(FILE_NAME, H5F_ACC_TRUNC);
-        
+
         // Create a group named "/MygGroup" in the file
         Group group(file.createGroup("/MyGroup"));
 
         // File and group will be closed as their instances go out of scope.
-   
+
     } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
     // catch failure caused by the Group operations
-    catch(GroupIException error)
-    {
+    catch (GroupIException error) {
         error.printError();
         return -1;
     }
- 
+
     return 0;
 }
diff --git a/c++/examples/h5tutr_crtgrpar.cpp b/c++/examples/h5tutr_crtgrpar.cpp
index d120833..6f2a2b3 100644
--- a/c++/examples/h5tutr_crtgrpar.cpp
+++ b/c++/examples/h5tutr_crtgrpar.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,22 +22,22 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 const H5std_string FILE_NAME("h5tutr_groups.h5");
 
-int main(void)
+int
+main(void)
 {
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
-      
+    try {
+
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately.
 
@@ -48,43 +48,39 @@ int main(void)
         H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
         // Create group "MyGroup" in the root group using an absolute name.
-         
-        Group group1(file.createGroup( "/MyGroup"));
- 
+
+        Group group1(file.createGroup("/MyGroup"));
+
         // Create group "Group_A" in group "MyGroup" using an
         // absolute name.
 
-        Group group2(file.createGroup("/MyGroup/Group_A"));   
+        Group group2(file.createGroup("/MyGroup/Group_A"));
 
         // Create group "Group_B" in group "MyGroup" using a
         // relative name.
-  
-        Group group3(group1.createGroup ("Group_B"));
- 
+
+        Group group3(group1.createGroup("Group_B"));
+
         // Close the groups and file.
 
         group1.close();
         group2.close();
         group3.close();
         file.close();
-    
+
     } // end of try block
 
     // catch failure caused by the File operations
-    catch(FileIException error)
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the Group operations
-    catch(GroupIException error)
-    {
+    catch (GroupIException error) {
         error.printError();
         return -1;
     }
 
     return 0;
 }
-
-
diff --git a/c++/examples/h5tutr_crtgrpd.cpp b/c++/examples/h5tutr_crtgrpd.cpp
index 12c6848..17033da 100644
--- a/c++/examples/h5tutr_crtgrpd.cpp
+++ b/c++/examples/h5tutr_crtgrpd.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,43 +22,43 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #ifndef H5_NO_STD
-     using std::cout;
-     using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 const H5std_string FILE_NAME("h5tutr_groups.h5");
 const H5std_string DATASET_NAME1("/MyGroup/dset1");
 const H5std_string DATASET_NAME2("dset2");
-const int       RANK = 2;
-const int       D1DIM1 = 3;
-const int       D1DIM2 = 3;
-const int       D2DIM1 = 2;
-const int       D2DIM2 = 10;
-
-int main(void)
+const int          RANK   = 2;
+const int          D1DIM1 = 3;
+const int          D1DIM2 = 3;
+const int          D2DIM1 = 2;
+const int          D2DIM2 = 10;
+
+int
+main(void)
 {
     int dset1_data[D1DIM1][D1DIM2], dset2_data[D2DIM1][D2DIM2]; // data buffers
     int i, j;
 
     // Try block to catch exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
-        // Initialize the first dataset. 
+        // Initialize the first dataset.
         for (i = 0; i < D1DIM1; i++)
             for (j = 0; j < D1DIM2; j++)
-               dset1_data[i][j] = j + 1;
+                dset1_data[i][j] = j + 1;
 
-        //  Initialize the second dataset. 
+        //  Initialize the second dataset.
         for (i = 0; i < D2DIM1; i++)
-          for (j = 0; j < D2DIM2; j++)
-              dset2_data[i][j] = j + 1;
+            for (j = 0; j < D2DIM2; j++)
+                dset2_data[i][j] = j + 1;
 
         // Open an existing file and dataset.
         H5File file(FILE_NAME, H5F_ACC_RDWR);
@@ -67,15 +67,14 @@ int main(void)
         // pointer for the instance 'dataspace'.  It can be deleted and
         // used again later for another data space.  An HDF5 identifier is
         // closed by the destructor or the method 'close()'.
-        hsize_t dims[RANK];               // dataset dimensions
-        dims[0] = D1DIM1;
-        dims[1] = D1DIM2;
-        DataSpace *dataspace = new DataSpace (RANK, dims);
+        hsize_t dims[RANK]; // dataset dimensions
+        dims[0]              = D1DIM1;
+        dims[1]              = D1DIM2;
+        DataSpace *dataspace = new DataSpace(RANK, dims);
 
         // Create the dataset in group "MyGroup".  Same note as for the
         // dataspace above.
-        DataSet *dataset = new DataSet (file.createDataSet(DATASET_NAME1, 
-                                         PredType::STD_I32BE, *dataspace));
+        DataSet *dataset = new DataSet(file.createDataSet(DATASET_NAME1, PredType::STD_I32BE, *dataspace));
 
         // Write the data to the dataset using default memory space, file
         // space, and transfer properties.
@@ -86,16 +85,15 @@ int main(void)
         delete dataspace;
 
         // Create the data space for the second dataset.
-        dims[0] = D2DIM1;
-        dims[1] = D2DIM2;
-        dataspace = new DataSpace (RANK, dims);
+        dims[0]   = D2DIM1;
+        dims[1]   = D2DIM2;
+        dataspace = new DataSpace(RANK, dims);
 
         // Create group "Group_A" in group "MyGroup".
         Group group(file.openGroup("/MyGroup/Group_A"));
 
         // Create the second dataset in group "Group_A".
-        dataset = new DataSet (group.createDataSet(DATASET_NAME2, 
-                                         PredType::STD_I32BE, *dataspace));
+        dataset = new DataSet(group.createDataSet(DATASET_NAME2, PredType::STD_I32BE, *dataspace));
 
         // Write the data to the dataset using default memory space, file
         // space, and transfer properties.
@@ -105,35 +103,31 @@ int main(void)
         delete dataspace;
         delete dataset;
         group.close();
-    
+
     } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
-         error.printError();
-         return -1;
+    catch (FileIException error) {
+        error.printError();
+        return -1;
     }
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
-         error.printError();
-         return -1;
+    catch (DataSetIException error) {
+        error.printError();
+        return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the Group operations
-    catch(GroupIException error)
-    {
+    catch (GroupIException error) {
         error.printError();
         return -1;
     }
- 
-     return 0;
+
+    return 0;
 }
diff --git a/c++/examples/h5tutr_extend.cpp b/c++/examples/h5tutr_extend.cpp
index 92576f1..0780b89 100644
--- a/c++/examples/h5tutr_extend.cpp
+++ b/c++/examples/h5tutr_extend.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,76 +22,70 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-     using namespace H5;
+using namespace H5;
 #ifndef H5_NO_STD
-     using std::cout;
-     using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
-const H5std_string      FILE_NAME("h5tutr_extend.h5");
-const H5std_string      DATASETNAME("ExtendibleArray");
+const H5std_string FILE_NAME("h5tutr_extend.h5");
+const H5std_string DATASETNAME("ExtendibleArray");
 
-int main (void)
+int
+main(void)
 {
-     hsize_t dims[2] = {3,3};           // dataset dimensions at creation
-     hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; 
-     hsize_t chunk_dims[2] ={2, 5};
-     int           data[3][3] = { {1, 1, 1},    // data to write 
-                                  {1, 1, 1},
-                                  {1, 1, 1} };
-
-     // Variables used in extending and writing to the extended portion of dataset 
-
-     hsize_t size[2];
-     hsize_t offset[2];
-     hsize_t dimsext[2] = {7, 3};         // extend dimensions 
-     int     dataext[7][3] = { {2, 3, 4},
-                                      {2, 3, 4},
-                                      {2, 3, 4},
-                                      {2, 3, 4},
-                                      {2, 3, 4},
-                                      {2, 3, 4},
-                                      {2, 3, 4} };
+    hsize_t dims[2]       = {3, 3}; // dataset dimensions at creation
+    hsize_t maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED};
+    hsize_t chunk_dims[2] = {2, 5};
+    int     data[3][3]    = {{1, 1, 1}, // data to write
+                      {1, 1, 1},
+                      {1, 1, 1}};
+
+    // Variables used in extending and writing to the extended portion of dataset
+
+    hsize_t size[2];
+    hsize_t offset[2];
+    hsize_t dimsext[2]    = {7, 3}; // extend dimensions
+    int     dataext[7][3] = {{2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}, {2, 3, 4}};
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
-        // Create a new file using the default property lists. 
+        // Create a new file using the default property lists.
         H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
         // Create the data space for the dataset.  Note the use of pointer
         // for the instance 'dataspace'.  It can be deleted and used again
         // later for another dataspace.  An HDF5 identifier can be closed
         // by the destructor or the method 'close()'.
-        DataSpace *dataspace = new DataSpace (2, dims, maxdims);
+        DataSpace *dataspace = new DataSpace(2, dims, maxdims);
 
         // Modify dataset creation property to enable chunking
         DSetCreatPropList prop;
         prop.setChunk(2, chunk_dims);
 
         // Create the chunked dataset.  Note the use of pointer.
-        DataSet *dataset = new DataSet(file.createDataSet( DATASETNAME, 
-                                 PredType::STD_I32BE, *dataspace, prop) );
- 
+        DataSet *dataset =
+            new DataSet(file.createDataSet(DATASETNAME, PredType::STD_I32BE, *dataspace, prop));
+
         // Write data to dataset.
         dataset->write(data, PredType::NATIVE_INT);
 
         // Extend the dataset. Dataset becomes 10 x 3.
         size[0] = dims[0] + dimsext[0];
         size[1] = dims[1];
-        dataset->extend(size); 
+        dataset->extend(size);
 
         // Select a hyperslab in extended portion of the dataset.
-        DataSpace *filespace = new DataSpace(dataset->getSpace ());
-        offset[0] = 3;
-        offset[1] = 0;
+        DataSpace *filespace = new DataSpace(dataset->getSpace());
+        offset[0]            = 3;
+        offset[1]            = 0;
         filespace->selectHyperslab(H5S_SELECT_SET, dimsext, offset);
-        
+
         // Define memory space.
         DataSpace *memspace = new DataSpace(2, dimsext, NULL);
 
@@ -106,37 +100,38 @@ int main (void)
         delete dataset;
         file.close();
 
-        // --------------------------------------- 
+        // ---------------------------------------
         // Re-open the file and read the data back
-        // --------------------------------------- 
+        // ---------------------------------------
 
-        int        rdata[10][3];
-        int        i,j, rank, rank_chunk;
-        hsize_t    chunk_dimsr[2], dimsr[2];
+        int     rdata[10][3];
+        int     i, j, rank, rank_chunk;
+        hsize_t chunk_dimsr[2], dimsr[2];
 
         // Open the file and dataset.
         file.openFile(FILE_NAME, H5F_ACC_RDONLY);
-        dataset = new DataSet(file.openDataSet( DATASETNAME)); 
+        dataset = new DataSet(file.openDataSet(DATASETNAME));
 
         // Get the dataset's dataspace and creation property list.
         filespace = new DataSpace(dataset->getSpace());
-        prop = dataset->getCreatePlist();
+        prop      = dataset->getCreatePlist();
 
         // Get information to obtain memory dataspace.
-        rank = filespace->getSimpleExtentNdims();
+        rank            = filespace->getSimpleExtentNdims();
         herr_t status_n = filespace->getSimpleExtentDims(dimsr);
 
         if (H5D_CHUNKED == prop.getLayout())
-             rank_chunk = prop.getChunk(rank, chunk_dimsr);
-        cout << "rank chunk = " << rank_chunk << endl;;
+            rank_chunk = prop.getChunk(rank, chunk_dimsr);
+        cout << "rank chunk = " << rank_chunk << endl;
+        ;
 
         memspace = new DataSpace(rank, dimsr, NULL);
         dataset->read(rdata, PredType::NATIVE_INT, *memspace, *filespace);
-      
+
         cout << endl;
         for (j = 0; j < dimsr[0]; j++) {
             for (i = 0; i < dimsr[1]; i++)
-               cout << " " <<  rdata[j][i];
+                cout << " " << rdata[j][i];
             cout << endl;
         }
 
@@ -146,30 +141,26 @@ int main (void)
         delete memspace;
         delete dataset;
         file.close();
-      
-    }  // end of try block
+
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
+    catch (DataSetIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/h5tutr_rdwt.cpp b/c++/examples/h5tutr_rdwt.cpp
index 076822f..d8b5da9 100644
--- a/c++/examples/h5tutr_rdwt.cpp
+++ b/c++/examples/h5tutr_rdwt.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,56 +22,54 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string      FILE_NAME("h5tutr_dset.h5");
-const H5std_string      DATASET_NAME("dset");
-const int       DIM0 = 4;                      // dataset dimensions
-const int       DIM1 = 6;
+const H5std_string FILE_NAME("h5tutr_dset.h5");
+const H5std_string DATASET_NAME("dset");
+const int          DIM0 = 4; // dataset dimensions
+const int          DIM1 = 6;
 
-int main (void)
+int
+main(void)
 {
-    
+
     // Data initialization.
-     
+
     int i, j;
-    int data[DIM0][DIM1];           // buffer for data to write
+    int data[DIM0][DIM1]; // buffer for data to write
 
     for (j = 0; j < DIM0; j++)
         for (i = 0; i < DIM1; i++)
-         data[j][i] = i * 6 + j + 1;
+            data[j][i] = i * 6 + j + 1;
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
         // Open an existing file and dataset.
-        H5File file(FILE_NAME, H5F_ACC_RDWR);
+        H5File  file(FILE_NAME, H5F_ACC_RDWR);
         DataSet dataset = file.openDataSet(DATASET_NAME);
 
         // Write the data to the dataset using default memory space, file
         // space, and transfer properties.
         dataset.write(data, PredType::NATIVE_INT);
 
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
+    catch (DataSetIException error) {
         error.printError();
         return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
diff --git a/c++/examples/h5tutr_subset.cpp b/c++/examples/h5tutr_subset.cpp
index 13720b9..68c9695 100644
--- a/c++/examples/h5tutr_subset.cpp
+++ b/c++/examples/h5tutr_subset.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,65 +22,63 @@
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-     using namespace H5;
+using namespace H5;
 #ifndef H5_NO_STD
-     using std::cout;
-     using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
-const H5std_string      FILE_NAME("h5tutr_subset.h5");
-const H5std_string      DATASET_NAME("IntArray");
+const H5std_string FILE_NAME("h5tutr_subset.h5");
+const H5std_string DATASET_NAME("IntArray");
 
-const int     RANK = 2;
-const int     DIM0_SUB = 3;     // subset dimensions
-const int     DIM1_SUB = 4;
-const int     DIM0 = 8;         // size of dataset
-const int     DIM1 = 10;
+const int RANK     = 2;
+const int DIM0_SUB = 3; // subset dimensions
+const int DIM1_SUB = 4;
+const int DIM0     = 8; // size of dataset
+const int DIM1     = 10;
 
-int main (void)
+int
+main(void)
 {
-    int     i,j;
-    int     data[DIM0][DIM1], sdata[DIM0_SUB][DIM1_SUB], rdata[DIM0][DIM1];
+    int i, j;
+    int data[DIM0][DIM1], sdata[DIM0_SUB][DIM1_SUB], rdata[DIM0][DIM1];
 
     // Try block to detect exceptions raised by any of the calls inside it
-    try
-    {
+    try {
         // Turn off the auto-printing when failure occurs so that we can
         // handle the errors appropriately
         Exception::dontPrint();
 
         // ---------------------------------------------------
-        // Create a new file using the default property lists. 
-        // Then create a dataset and write data to it. 
+        // Create a new file using the default property lists.
+        // Then create a dataset and write data to it.
         // Close the file and dataset.
         // ---------------------------------------------------
-      
-        H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
-        hsize_t dims[2];              
-        dims[0] = DIM0;
-        dims[1] = DIM1;
-        DataSpace dataspace = DataSpace (RANK, dims);
+        H5File file(FILE_NAME, H5F_ACC_TRUNC);
 
-        DataSet dataset(file.createDataSet( DATASET_NAME, 
-                                         PredType::STD_I32BE, dataspace) );
+        hsize_t dims[2];
+        dims[0]             = DIM0;
+        dims[1]             = DIM1;
+        DataSpace dataspace = DataSpace(RANK, dims);
 
+        DataSet dataset(file.createDataSet(DATASET_NAME, PredType::STD_I32BE, dataspace));
 
         for (j = 0; j < DIM0; j++) {
-             for (i = 0; i < DIM1; i++)
-                 if (i< (DIM1/2))
+            for (i = 0; i < DIM1; i++)
+                if (i < (DIM1 / 2))
                     data[j][i] = 1;
-                 else
+                else
                     data[j][i] = 2;
-              }
+        }
 
         dataset.write(data, PredType::NATIVE_INT);
 
         cout << endl << "Data Written to File:" << endl;
         for (j = 0; j < DIM0; j++) {
             for (i = 0; i < DIM1; i++)
-               cout << " " <<  data[j][i];
+                cout << " " << data[j][i];
             cout << endl;
         }
 
@@ -99,20 +97,20 @@ int main (void)
         file.openFile(FILE_NAME, H5F_ACC_RDWR);
         dataset = file.openDataSet(DATASET_NAME);
 
-        // Specify size and shape of subset to write. 
+        // Specify size and shape of subset to write.
 
         offset[0] = 1;
         offset[1] = 2;
 
-        count[0]  = DIM0_SUB;
-        count[1]  = DIM1_SUB;
+        count[0] = DIM0_SUB;
+        count[1] = DIM1_SUB;
 
         stride[0] = 1;
         stride[1] = 1;
 
         block[0] = 1;
         block[1] = 1;
-  
+
         // Define Memory Dataspace. Get file dataspace and select
         // a subset from the file dataspace.
 
@@ -122,7 +120,7 @@ int main (void)
         DataSpace memspace(RANK, dimsm, NULL);
 
         dataspace = dataset.getSpace();
-        dataspace.selectHyperslab(H5S_SELECT_SET, count, offset, stride, block); 
+        dataspace.selectHyperslab(H5S_SELECT_SET, count, offset, stride, block);
 
         // Write a subset of data to the dataset, then read the
         // entire dataset back from the file.
@@ -131,17 +129,16 @@ int main (void)
         cout << "  offset=1x2 stride=1x1 count=3x4 block=1x1" << endl;
         for (j = 0; j < DIM0_SUB; j++) {
             for (i = 0; i < DIM1_SUB; i++)
-               sdata[j][i] = 5;
-        } 
-        
+                sdata[j][i] = 5;
+        }
+
         dataset.write(sdata, PredType::NATIVE_INT, memspace, dataspace);
         dataset.read(rdata, PredType::NATIVE_INT);
 
- 
         cout << endl << "Data in File after Subset is Written:" << endl;
         for (i = 0; i < DIM0; i++) {
-            for (j = 0; j < DIM1; j++) 
-               cout << " " <<  rdata[i][j];
+            for (j = 0; j < DIM1; j++)
+                cout << " " << rdata[i][j];
             cout << endl;
         }
         cout << endl;
@@ -153,29 +150,25 @@ int main (void)
         dataset.close();
         file.close();
 
-    }  // end of try block
+    } // end of try block
 
     // catch failure caused by the H5File operations
-    catch(FileIException error)
-    {
+    catch (FileIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSet operations
-    catch(DataSetIException error)
-    {
+    catch (DataSetIException error) {
         error.printError();
         return -1;
     }
 
     // catch failure caused by the DataSpace operations
-    catch(DataSpaceIException error)
-    {
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
     }
 
-    return 0;  // successfully terminated
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/readdata.cpp b/c++/examples/readdata.cpp
index 3826090..d8cff55 100644
--- a/c++/examples/readdata.cpp
+++ b/c++/examples/readdata.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -26,195 +26,185 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string FILE_NAME( "SDS.h5" );
-const H5std_string DATASET_NAME( "IntArray" );
-const int    NX_SUB = 3;        // hyperslab dimensions
-const int    NY_SUB = 4;
-const int    NX = 7;            // output buffer dimensions
-const int    NY = 7;
-const int    NZ = 3;
-const int    RANK_OUT = 3;
-
-int main (void)
+const H5std_string FILE_NAME("SDS.h5");
+const H5std_string DATASET_NAME("IntArray");
+const int          NX_SUB   = 3; // hyperslab dimensions
+const int          NY_SUB   = 4;
+const int          NX       = 7; // output buffer dimensions
+const int          NY       = 7;
+const int          NZ       = 3;
+const int          RANK_OUT = 3;
+
+int
+main(void)
 {
-   /*
-    * Output buffer initialization.
-    */
-   int i, j, k;
-   int         data_out[NX][NY][NZ ]; /* output buffer */
-   for (j = 0; j < NX; j++)
-   {
-      for (i = 0; i < NY; i++)
-      {
-         for (k = 0; k < NZ ; k++)
-            data_out[j][i][k] = 0;
-      }
-   }
-
-   /*
-    * Try block to detect exceptions raised by any of the calls inside it
-    */
-   try
-   {
-      /*
-       * Turn off the auto-printing when failure occurs so that we can
-       * handle the errors appropriately
-       */
-      Exception::dontPrint();
-
-      /*
-       * Open the specified file and the specified dataset in the file.
-       */
-      H5File file( FILE_NAME, H5F_ACC_RDONLY );
-      DataSet dataset = file.openDataSet( DATASET_NAME );
-
-      /*
-       * Get the class of the datatype that is used by the dataset.
-       */
-      H5T_class_t type_class = dataset.getTypeClass();
-
-      /*
-       * Get class of datatype and print message if it's an integer.
-       */
-      if( type_class == H5T_INTEGER )
-      {
-         cout << "Data set has INTEGER type" << endl;
-
-         /*
-          * Get the integer datatype
-          */
-         IntType intype = dataset.getIntType();
-
-         /*
-          * Get order of datatype and print message if it's a little endian.
-          */
-         H5std_string order_string;
-         H5T_order_t order = intype.getOrder( order_string );
-         cout << order_string << endl;
-
-         /*
-          * Get size of the data element stored in file and print it.
-          */
-         size_t size = intype.getSize();
-         cout << "Data size is " << size << endl;
-      }
-
-      /*
-       * Get dataspace of the dataset.
-       */
-      DataSpace dataspace = dataset.getSpace();
-
-      /*
-       * Get the number of dimensions in the dataspace.
-       */
-      int rank = dataspace.getSimpleExtentNdims();
-
-      /*
-       * Get the dimension size of each dimension in the dataspace and
-       * display them.
-       */
-      hsize_t dims_out[2];
-      int ndims = dataspace.getSimpleExtentDims( dims_out, NULL);
-      cout << "rank " << rank << ", dimensions " <<
-              (unsigned long)(dims_out[0]) << " x " <<
-              (unsigned long)(dims_out[1]) << endl;
-
-      /*
-       * Define hyperslab in the dataset; implicitly giving strike and
-       * block NULL.
-       */
-      hsize_t      offset[2];   // hyperslab offset in the file
-      hsize_t      count[2];    // size of the hyperslab in the file
-      offset[0] = 1;
-      offset[1] = 2;
-      count[0]  = NX_SUB;
-      count[1]  = NY_SUB;
-      dataspace.selectHyperslab( H5S_SELECT_SET, count, offset );
-
-      /*
-       * Define the memory dataspace.
-       */
-      hsize_t     dimsm[3];              /* memory space dimensions */
-      dimsm[0] = NX;
-      dimsm[1] = NY;
-      dimsm[2] = NZ ;
-      DataSpace memspace( RANK_OUT, dimsm );
-
-      /*
-       * Define memory hyperslab.
-       */
-      hsize_t      offset_out[3];       // hyperslab offset in memory
-      hsize_t      count_out[3];        // size of the hyperslab in memory
-      offset_out[0] = 3;
-      offset_out[1] = 0;
-      offset_out[2] = 0;
-      count_out[0]  = NX_SUB;
-      count_out[1]  = NY_SUB;
-      count_out[2]  = 1;
-      memspace.selectHyperslab( H5S_SELECT_SET, count_out, offset_out );
-
-      /*
-       * Read data from hyperslab in the file into the hyperslab in
-       * memory and display the data.
-       */
-      dataset.read( data_out, PredType::NATIVE_INT, memspace, dataspace );
-
-      for (j = 0; j < NX; j++)
-      {
-        for (i = 0; i < NY; i++)
-           cout << data_out[j][i][0] << " ";
-        cout << endl;
-      }
-      /*
-       * 0 0 0 0 0 0 0
-       * 0 0 0 0 0 0 0
-       * 0 0 0 0 0 0 0
-       * 3 4 5 6 0 0 0
-       * 4 5 6 7 0 0 0
-       * 5 6 7 8 0 0 0
-       * 0 0 0 0 0 0 0
-       */
-   }  // end of try block
-
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   // catch failure caused by the DataSpace operations
-   catch( DataTypeIException error )
-   {
-      error.printError();
-      return -1;
-   }
-
-   return 0;  // successfully terminated
+    /*
+     * Output buffer initialization.
+     */
+    int i, j, k;
+    int data_out[NX][NY][NZ]; /* output buffer */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            for (k = 0; k < NZ; k++)
+                data_out[j][i][k] = 0;
+        }
+    }
+
+    /*
+     * Try block to detect exceptions raised by any of the calls inside it
+     */
+    try {
+        /*
+         * Turn off the auto-printing when failure occurs so that we can
+         * handle the errors appropriately
+         */
+        Exception::dontPrint();
+
+        /*
+         * Open the specified file and the specified dataset in the file.
+         */
+        H5File  file(FILE_NAME, H5F_ACC_RDONLY);
+        DataSet dataset = file.openDataSet(DATASET_NAME);
+
+        /*
+         * Get the class of the datatype that is used by the dataset.
+         */
+        H5T_class_t type_class = dataset.getTypeClass();
+
+        /*
+         * Get class of datatype and print message if it's an integer.
+         */
+        if (type_class == H5T_INTEGER) {
+            cout << "Data set has INTEGER type" << endl;
+
+            /*
+             * Get the integer datatype
+             */
+            IntType intype = dataset.getIntType();
+
+            /*
+             * Get order of datatype and print message if it's a little endian.
+             */
+            H5std_string order_string;
+            H5T_order_t  order = intype.getOrder(order_string);
+            cout << order_string << endl;
+
+            /*
+             * Get size of the data element stored in file and print it.
+             */
+            size_t size = intype.getSize();
+            cout << "Data size is " << size << endl;
+        }
+
+        /*
+         * Get dataspace of the dataset.
+         */
+        DataSpace dataspace = dataset.getSpace();
+
+        /*
+         * Get the number of dimensions in the dataspace.
+         */
+        int rank = dataspace.getSimpleExtentNdims();
+
+        /*
+         * Get the dimension size of each dimension in the dataspace and
+         * display them.
+         */
+        hsize_t dims_out[2];
+        int     ndims = dataspace.getSimpleExtentDims(dims_out, NULL);
+        cout << "rank " << rank << ", dimensions " << (unsigned long)(dims_out[0]) << " x "
+             << (unsigned long)(dims_out[1]) << endl;
+
+        /*
+         * Define hyperslab in the dataset; implicitly giving strike and
+         * block NULL.
+         */
+        hsize_t offset[2]; // hyperslab offset in the file
+        hsize_t count[2];  // size of the hyperslab in the file
+        offset[0] = 1;
+        offset[1] = 2;
+        count[0]  = NX_SUB;
+        count[1]  = NY_SUB;
+        dataspace.selectHyperslab(H5S_SELECT_SET, count, offset);
+
+        /*
+         * Define the memory dataspace.
+         */
+        hsize_t dimsm[3]; /* memory space dimensions */
+        dimsm[0] = NX;
+        dimsm[1] = NY;
+        dimsm[2] = NZ;
+        DataSpace memspace(RANK_OUT, dimsm);
+
+        /*
+         * Define memory hyperslab.
+         */
+        hsize_t offset_out[3]; // hyperslab offset in memory
+        hsize_t count_out[3];  // size of the hyperslab in memory
+        offset_out[0] = 3;
+        offset_out[1] = 0;
+        offset_out[2] = 0;
+        count_out[0]  = NX_SUB;
+        count_out[1]  = NY_SUB;
+        count_out[2]  = 1;
+        memspace.selectHyperslab(H5S_SELECT_SET, count_out, offset_out);
+
+        /*
+         * Read data from hyperslab in the file into the hyperslab in
+         * memory and display the data.
+         */
+        dataset.read(data_out, PredType::NATIVE_INT, memspace, dataspace);
+
+        for (j = 0; j < NX; j++) {
+            for (i = 0; i < NY; i++)
+                cout << data_out[j][i][0] << " ";
+            cout << endl;
+        }
+        /*
+         * 0 0 0 0 0 0 0
+         * 0 0 0 0 0 0 0
+         * 0 0 0 0 0 0 0
+         * 3 4 5 6 0 0 0
+         * 4 5 6 7 0 0 0
+         * 5 6 7 8 0 0 0
+         * 0 0 0 0 0 0 0
+         */
+    } // end of try block
+
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
+        error.printError();
+        return -1;
+    }
+
+    // catch failure caused by the DataSpace operations
+    catch (DataTypeIException error) {
+        error.printError();
+        return -1;
+    }
+
+    return 0; // successfully terminated
 }
-
diff --git a/c++/examples/run-c++-ex.sh.in b/c++/examples/run-c++-ex.sh.in
index 315010e..ff71945 100644
--- a/c++/examples/run-c++-ex.sh.in
+++ b/c++/examples/run-c++-ex.sh.in
@@ -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.
 
@@ -18,7 +18,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                               #
 # This script will compile and run the c++ examples from source files           #
-# installed in .../share/hdf5_examples/c++ using h5c++.  The                    #
+# installed in @examplesdir@/c++ using h5c++.  The                              #
 # order for running programs with RunTest in the MAIN section below is taken    #
 # from the Makefile.  The order is important since some of the test programs    #
 # use data files created by earlier test programs.  Any future additions should #
@@ -30,9 +30,32 @@
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
+#
+# Try to derive the path to the installation $prefix established
+# by ./configure relative to the examples directory established by
+# ./configure.  If successful, set `prefix_relto_examplesdir` to the
+# relative path.  Otherwise, set `prefix_relto_examplesdir` to the
+# absolute installation $prefix.
+#
+# This script uses the value of `prefix` in the user's environment, if
+# it is set, below.  The content of $() is evaluated in a sub-shell, so
+# if `prefix` is set in the user's environment, the shell statements in
+# $() won't clobber it.
+#
+prefix_relto_examplesdir=$(
+prefix=@prefix@
+examplesdir=@examplesdir@
+if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then
+        echo $(echo ${examplesdir##${prefix}/} | \
+            sed 's,[^/][^/]*,..,g')
+else
+        echo $prefix
+fi
+)
+
 # Where the tool is installed.
 # default is relative path to installed location of the tools
-prefix="${prefix:-../../../}"
+prefix="${prefix:-../${prefix_relto_examplesdir}}"
 AR="@AR@"
 RANLIB="@RANLIB@"
 H5TOOL="h5c++"                  # The tool name
diff --git a/c++/examples/testh5c++.sh.in b/c++/examples/testh5c++.sh.in
index c82ccc3..041d349 100644
--- a/c++/examples/testh5c++.sh.in
+++ b/c++/examples/testh5c++.sh.in
@@ -7,7 +7,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.
 #
@@ -57,7 +57,7 @@ applib=libapp${H5TOOL}.a
 # short hands
 # Caution: if some *.h5 files must be cleaned here, list them by names.
 # Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated
-# by otehr test programs. This will cause a racing condition error when
+# by other test programs. This will cause a racing condition error when
 # parallel make (e.g., gmake -j 4) is used.
 temp_SRC="$hdf5main $appmain $prog1 $prog2"
 temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"`
diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp
index f8a1cea..afbd8dc 100644
--- a/c++/examples/writedata.cpp
+++ b/c++/examples/writedata.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -29,42 +29,42 @@
 
 #ifndef H5_NO_NAMESPACE
 #ifndef H5_NO_STD
-    using std::cout;
-    using std::endl;
-#endif  // H5_NO_STD
+using std::cout;
+using std::endl;
+#endif // H5_NO_STD
 #endif
 
 #include "H5Cpp.h"
 
 #ifndef H5_NO_NAMESPACE
-    using namespace H5;
+using namespace H5;
 #endif
 
-const H5std_string FILE_NAME( "Select.h5" );
-const H5std_string DATASET_NAME( "Matrix in file" );
-const int   MSPACE1_RANK = 1;   // Rank of the first dataset in memory
-const int   MSPACE1_DIM = 50;   // Dataset size in memory
-const int   MSPACE2_RANK = 1;   // Rank of the second dataset in memory
-const int   MSPACE2_DIM = 4;    // Dataset size in memory
-const int   FSPACE_RANK = 2;    // Dataset rank as it is stored in the file
-const int   FSPACE_DIM1 = 8;    // Dimension sizes of the dataset as it is
-const int   FSPACE_DIM2 = 12;   //      stored in the file
-const int   MSPACE_RANK = 2;    // Rank of the first dataset in memory
-const int   MSPACE_DIM1 = 8;    // We will read dataset back from the file
-const int   MSPACE_DIM2 = 9;    //      to the dataset in memory with these
-                                //      dataspace parameters
-const int   NPOINTS = 4;        // Number of points that will be selected
-                                //      and overwritten
-
-int main (void)
+const H5std_string FILE_NAME("Select.h5");
+const H5std_string DATASET_NAME("Matrix in file");
+const int          MSPACE1_RANK = 1;  // Rank of the first dataset in memory
+const int          MSPACE1_DIM  = 50; // Dataset size in memory
+const int          MSPACE2_RANK = 1;  // Rank of the second dataset in memory
+const int          MSPACE2_DIM  = 4;  // Dataset size in memory
+const int          FSPACE_RANK  = 2;  // Dataset rank as it is stored in the file
+const int          FSPACE_DIM1  = 8;  // Dimension sizes of the dataset as it is
+const int          FSPACE_DIM2  = 12; //      stored in the file
+const int          MSPACE_RANK  = 2;  // Rank of the first dataset in memory
+const int          MSPACE_DIM1  = 8;  // We will read dataset back from the file
+const int          MSPACE_DIM2  = 9;  //      to the dataset in memory with these
+                                      //      dataspace parameters
+const int NPOINTS = 4;                // Number of points that will be selected
+                                      //      and overwritten
+
+int
+main(void)
 {
-    int   i,j; // loop indices */
+    int i, j; // loop indices */
 
     /*
      * Try block to detect exceptions raised by any of the calls inside it
      */
-    try
-    {
+    try {
         /*
          * Turn off the auto-printing when failure occurs so that we can
          * handle the errors appropriately
@@ -74,47 +74,51 @@ int main (void)
         /*
          * Create a file.
          */
-        H5File* file = new H5File( FILE_NAME, H5F_ACC_TRUNC );
+        H5File *file = new H5File(FILE_NAME, H5F_ACC_TRUNC);
 
         /*
-        * Create property list for a dataset and set up fill values.
-        */
-        int fillvalue = 0;   /* Fill value for the dataset */
+         * Create property list for a dataset and set up fill values.
+         */
+        int               fillvalue = 0; /* Fill value for the dataset */
         DSetCreatPropList plist;
         plist.setFillValue(PredType::NATIVE_INT, &fillvalue);
 
         /*
          * Create dataspace for the dataset in the file.
          */
-        hsize_t fdim[] = {FSPACE_DIM1, FSPACE_DIM2}; // dim sizes of ds (on disk)
-        DataSpace fspace( FSPACE_RANK, fdim );
+        hsize_t   fdim[] = {FSPACE_DIM1, FSPACE_DIM2}; // dim sizes of ds (on disk)
+        DataSpace fspace(FSPACE_RANK, fdim);
 
         /*
          * Create dataset and write it into the file.
          */
-        DataSet* dataset = new DataSet(file->createDataSet(
-                DATASET_NAME, PredType::NATIVE_INT, fspace, plist));
+        DataSet *dataset =
+            new DataSet(file->createDataSet(DATASET_NAME, PredType::NATIVE_INT, fspace, plist));
 
         /*
          * Select hyperslab for the dataset in the file, using 3x2 blocks,
          * (4,3) stride and (2,4) count starting at the position (0,1).
          */
-        hsize_t start[2]; // Start of hyperslab
+        hsize_t start[2];  // Start of hyperslab
         hsize_t stride[2]; // Stride of hyperslab
         hsize_t count[2];  // Block count
         hsize_t block[2];  // Block sizes
-        start[0]  = 0; start[1]  = 1;
-        stride[0] = 4; stride[1] = 3;
-        count[0]  = 2; count[1]  = 4;
-        block[0]  = 3; block[1]  = 2;
-        fspace.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
+        start[0]  = 0;
+        start[1]  = 1;
+        stride[0] = 4;
+        stride[1] = 3;
+        count[0]  = 2;
+        count[1]  = 4;
+        block[0]  = 3;
+        block[1]  = 2;
+        fspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
 
         /*
          * Create dataspace for the first dataset.
          */
-        hsize_t dim1[] = {MSPACE1_DIM};  /* Dimension size of the first dataset
-                                           (in memory) */
-        DataSpace mspace1( MSPACE1_RANK, dim1 );
+        hsize_t dim1[] = {MSPACE1_DIM}; /* Dimension size of the first dataset
+                                          (in memory) */
+        DataSpace mspace1(MSPACE1_RANK, dim1);
 
         /*
          * Select hyperslab.
@@ -125,7 +129,7 @@ int main (void)
         stride[0] = 1;
         count[0]  = 48;
         block[0]  = 1;
-        mspace1.selectHyperslab( H5S_SELECT_SET, count, start, stride, block);
+        mspace1.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
 
         /*
          * Write selection from the vector buffer to the dataset in the file.
@@ -140,7 +144,7 @@ int main (void)
          *                    0 41 42  0 43 44  0 45 46  0 47 48
          *                    0  0  0  0  0  0  0  0  0  0  0  0
          */
-        int    vector[MSPACE1_DIM];     // vector buffer for dset
+        int vector[MSPACE1_DIM]; // vector buffer for dset
 
         /*
          * Buffer initialization.
@@ -149,7 +153,7 @@ int main (void)
         for (i = 1; i < MSPACE1_DIM - 1; i++)
             vector[i] = i;
 
-        dataset->write( vector, PredType::NATIVE_INT, mspace1, fspace );
+        dataset->write(vector, PredType::NATIVE_INT, mspace1, fspace);
 
         /*
          * Reset the selection for the file dataspace fid.
@@ -159,27 +163,31 @@ int main (void)
         /*
          * Create dataspace for the second dataset.
          */
-        hsize_t dim2[] = {MSPACE2_DIM};  /* Dimension size of the second dataset
-                                           (in memory */
-        DataSpace mspace2( MSPACE2_RANK, dim2 );
+        hsize_t dim2[] = {MSPACE2_DIM}; /* Dimension size of the second dataset
+                                          (in memory */
+        DataSpace mspace2(MSPACE2_RANK, dim2);
 
         /*
          * Select sequence of NPOINTS points in the file dataspace.
          */
         hsize_t coord[NPOINTS][FSPACE_RANK]; /* Array to store selected points
                                                 from the file dataspace */
-        coord[0][0] = 0; coord[0][1] = 0;
-        coord[1][0] = 3; coord[1][1] = 3;
-        coord[2][0] = 3; coord[2][1] = 5;
-        coord[3][0] = 5; coord[3][1] = 6;
+        coord[0][0] = 0;
+        coord[0][1] = 0;
+        coord[1][0] = 3;
+        coord[1][1] = 3;
+        coord[2][0] = 3;
+        coord[2][1] = 5;
+        coord[3][0] = 5;
+        coord[3][1] = 6;
 
-        fspace.selectElements( H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
+        fspace.selectElements(H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
 
         /*
          * Write new selection of points to the dataset.
          */
-        int    values[] = {53, 59, 61, 67};  /* New values to be written */
-        dataset->write( values, PredType::NATIVE_INT, mspace2, fspace );
+        int values[] = {53, 59, 61, 67}; /* New values to be written */
+        dataset->write(values, PredType::NATIVE_INT, mspace2, fspace);
 
         /*
          * File dataset should look like this:
@@ -203,12 +211,12 @@ int main (void)
         /*
          * Open the file.
          */
-        file = new H5File( FILE_NAME, H5F_ACC_RDONLY );
+        file = new H5File(FILE_NAME, H5F_ACC_RDONLY);
 
         /*
          * Open the dataset.
          */
-        dataset = new DataSet( file->openDataSet( DATASET_NAME ));
+        dataset = new DataSet(file->openDataSet(DATASET_NAME));
 
         /*
          * Get dataspace of the dataset.
@@ -223,10 +231,14 @@ int main (void)
          *                      0 59  0 61
          *
          */
-        start[0] = 1; start[1] = 2;
-        block[0] = 1; block[1] = 1;
-        stride[0] = 1; stride[1] = 1;
-        count[0]  = 3; count[1]  = 4;
+        start[0]  = 1;
+        start[1]  = 2;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 3;
+        count[1]  = 4;
         fspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
 
         /*
@@ -242,10 +254,14 @@ int main (void)
          *                                              19 20
          *                                               0 61
          */
-        start[0] = 2; start[1] = 4;
-        block[0] = 1; block[1] = 1;
-        stride[0] = 1; stride[1] = 1;
-        count[0]  = 6; count[1]  = 5;
+        start[0]  = 2;
+        start[1]  = 4;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 6;
+        count[1]  = 5;
         fspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
 
         /*
@@ -261,15 +277,23 @@ int main (void)
          * Select two hyperslabs in memory. Hyperslabs has the same
          * size and shape as the selected hyperslabs for the file dataspace.
          */
-        start[0] = 0; start[1] = 0;
-        block[0] = 1; block[1] = 1;
-        stride[0] = 1; stride[1] = 1;
-        count[0]  = 3; count[1]  = 4;
+        start[0]  = 0;
+        start[1]  = 0;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 3;
+        count[1]  = 4;
         mspace.selectHyperslab(H5S_SELECT_SET, count, start, stride, block);
-        start[0] = 1; start[1] = 2;
-        block[0] = 1; block[1] = 1;
-        stride[0] = 1; stride[1] = 1;
-        count[0]  = 6; count[1]  = 5;
+        start[0]  = 1;
+        start[1]  = 2;
+        block[0]  = 1;
+        block[1]  = 1;
+        stride[0] = 1;
+        stride[1] = 1;
+        count[0]  = 6;
+        count[1]  = 5;
         mspace.selectHyperslab(H5S_SELECT_OR, count, start, stride, block);
 
         /*
@@ -297,9 +321,8 @@ int main (void)
          *                     0  0  0  0  0  0  0  0  0
          *                     0  0  0  0  0  0  0  0  0
          */
-        for (i=0; i < MSPACE_DIM1; i++)
-        {
-            for(j=0; j < MSPACE_DIM2; j++)
+        for (i = 0; i < MSPACE_DIM1; i++) {
+            for (j = 0; j < MSPACE_DIM2; j++)
                 cout << matrix_out[i][j] << "  ";
             cout << endl;
         }
@@ -309,28 +332,25 @@ int main (void)
          */
         delete dataset;
         delete file;
-   }  // end of try block
+    } // end of try block
 
-   // catch failure caused by the H5File operations
-   catch( FileIException error )
-   {
+    // catch failure caused by the H5File operations
+    catch (FileIException error) {
         error.printError();
         return -1;
-   }
+    }
 
-   // catch failure caused by the DataSet operations
-   catch( DataSetIException error )
-   {
+    // catch failure caused by the DataSet operations
+    catch (DataSetIException error) {
         error.printError();
         return -1;
-   }
+    }
 
-   // catch failure caused by the DataSpace operations
-   catch( DataSpaceIException error )
-   {
+    // catch failure caused by the DataSpace operations
+    catch (DataSpaceIException error) {
         error.printError();
         return -1;
-   }
+    }
 
-   return 0;
+    return 0;
 }
author	Larry Knox <lrknox@hdfgroup.org>	2021-02-08 16:56:16 (GMT)
committer	GitHub <noreply@github.com>	2021-02-08 16:56:16 (GMT)
commit	22c67ff6570f16050f0a5654cf1c84df917bb598 (patch)
tree	38fb63aa498b250c2543fe7e22a511706de96a42 /c++/examples
parent	551f15f8ae02ca9c995619b216121081eb07633e (diff)
download	hdf5-hdf5-1_8_22.zip hdf5-hdf5-1_8_22.tar.gz hdf5-hdf5-1_8_22.tar.bz2