Hdf5 1 10 merges from dev (#662)

* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merge updates

#358 patches from vtk
#361 fix header guard spelling

* format fix

* Fix missing underscore and make H5public.h closer to dev

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
JNI cleanup

* format alignment

* Add missing test ref file

* Merge #380 from develop

* Finish java merges from develop

* Fix java issues with tests and javadoc

* Correct use of attribute access plist

* Remove debug code

* Remove unused variable

* Change file access to read only for java tests

* Split clang format operations.

* More javadoc comments

* Remove pre-split setting

* format source

* Change windows TS to use older VS.

* Mostly all javadoc fixes, one argument rename.

* synch file

* Merge of long double fix and compiler flags

* HDFFV-11229 merge changes from develop

* HDFFV-11229 correct test script

* HDFFV-11229 update autotools test script for two ref files

* HDFFV-11229 merge dev changes for long double display in tools

* Committing clang-format changes

* minor whitespace

* remove unneeded macro

* Committing clang-format changes

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

Update pkgconfig scripts for parallel builds.
Fix install COPYING file reference.
Remove unused round defines.
Change CMake default setting of BUILD_CPP to off.

* Fortran target depends

* Remove incorrect source attribute

* Revert define removal

* printf specifiers and VS2015 min changes

* Committing clang-format changes

* Add time struct

* TRILAB-227 and tools debug merges from develop

* Merge various changes from dev

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

2 files changed, 5 insertions, 10 deletions

diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 1d78322..bb5fb3f 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -734,7 +734,7 @@ BUILD_STATIC_EXECS "Build Static Executables"  OFF
 BUILD_TESTING      "Build HDF5 Unit Testing"   ON
 
 ---------------- HDF5 Build Options ---------------------
-HDF5_BUILD_CPP_LIB  "Build HDF5 C++ Library"         ON
+HDF5_BUILD_CPP_LIB  "Build HDF5 C++ Library"         OFF
 HDF5_BUILD_EXAMPLES "Build HDF5 Library Examples"    ON
 HDF5_BUILD_FORTRAN  "Build FORTRAN support"          OFF
 HDF5_BUILD_JAVA     "Build JAVA support"             OFF
diff --git a/release_docs/INSTALL_Warnings.txt b/release_docs/INSTALL_Warnings.txt
index 5fde45f..97981be 100644
--- a/release_docs/INSTALL_Warnings.txt
+++ b/release_docs/INSTALL_Warnings.txt
@@ -60,7 +60,6 @@ Autotools UNIX warnings added to H5_CFLAGS
     -Wcast-align
     -Wcast-qual
     -Wconversion
-    -Wdeclaration-after-statement
     -Wdisabled-optimization
     -Wfloat-equal
     -Wformat=2
@@ -88,11 +87,13 @@ Autotools UNIX warnings added to H5_CFLAGS
         -Waggregate-return
         -Wmissing-format-attribute
         -Wmissing-noreturn
+        -Wunsuffixed-float-constants (gcc 4.5+)
    enable-developer-warnings=OFF
         -Wno-inline
         -Wno-aggregate-return
         -Wno-missing-format-attribute
         -Wno-missing-noreturn
+        -Wno-unsuffixed-float-constants (gcc 4.5+)
 
 IF GCC <= 4.3
     -Wno-long-long
@@ -128,7 +129,6 @@ IF GCC <= 4.6
     -Wstrict-aliasing
     -Wstrict-overflow=5
     -Wjump-misses-init
-    -Wunsuffixed-float-constants
 
 IF GCC <= 4.7
     -Wno-long-long
@@ -141,7 +141,6 @@ IF GCC <= 4.7
     -Wstrict-aliasing
     -Wstrict-overflow=5
     -Wjump-misses-init
-    -Wunsuffixed-float-constants
     -Wdouble-promotion
     -Wtrampolines
    enable-developer-warnings=ON:
@@ -158,7 +157,6 @@ IF GCC <= 4.8
     -Wpacked-bitfield-compat
     -Wstrict-overflow=5
     -Wjump-misses-init
-    -Wunsuffixed-float-constants
     -Wdouble-promotion
     -Wtrampolines
     -Wstack-usage=8192
@@ -205,7 +203,6 @@ IF GCC < 5
     -Wpacked-bitfield-compat
     -Wstrict-overflow=5
     -Wjump-misses-init
-    -Wunsuffixed-float-constants
     -Wdouble-promotion
     -Wtrampolines
     -Wstack-usage=8192
@@ -231,7 +228,6 @@ IF GCC < 6
     -Wpacked-bitfield-compat
     -Wstrict-overflow=5
     -Wjump-misses-init
-    -Wunsuffixed-float-constants
     -Wdouble-promotion
     -Wtrampolines
     -Wstack-usage=8192
@@ -259,7 +255,6 @@ IF GCC < 7
     -Wpacked-bitfield-compat
     -Wstrict-overflow=5
     -Wjump-misses-init
-    -Wunsuffixed-float-constants
     -Wdouble-promotion
     -Wtrampolines
     -Wstack-usage=8192
@@ -295,7 +290,6 @@ IF GNU GCC
     -Wcast-align
     -Wcast-qual
     -Wconversion
-    -Wdeclaration-after-statement
     -Wdisabled-optimization
     -Wfloat-equal
     -Wformat=2
@@ -322,10 +316,12 @@ IF GNU GCC
    HDF5_ENABLE_DEV_WARNINGS=ON
         -Winline
         -Waggregate-return
+        -Wunsuffixed-float-constants (gcc 4.5+)
    HDF5_ENABLE_DEV_WARNINGS=OFF
         -Wno-unused-parameter
         -Wno-inline
         -Wno-aggregate-return
+        -Wno-unsuffixed-float-constants (gcc 4.5+)
 
 
 ========================================================================
@@ -383,7 +379,6 @@ HDF5_ENABLE_GROUPONE_WARNINGS:BOOL=ON
       IF GCC >= 4.5
         -Wstrict-overflow=5
         -Wjump-misses-init
-        -Wunsuffixed-float-constants
 
 
 ========================================================================