Merge remote-tracking branch 'canonical/develop' into feature/onion_vfd

9 files changed, 32 insertions, 18 deletions

diff --git a/config/gnu-warnings/cxx-developer-4.8 b/config/gnu-warnings/cxx-developer-4.8
new file mode 100644
index 0000000..e0d975f
--- /dev/null
+++ b/config/gnu-warnings/cxx-developer-4.8
@@ -0,0 +1,16 @@
+# developer warning flags added for GCC >= 4.5
+#
+# developer warning flag added for GCC >= 4.6
+-Wsuggest-attribute=const
+
+# developer warning flags added for GCC >= 4.7
+-Wsuggest-attribute=noreturn
+-Wsuggest-attribute=pure
+#
+# It's not clear that -Wvector-operation-performance warnings are
+# actionable, so they are demoted to "developer" warnings.
+#
+-Wvector-operation-performance
+
+# developer warning flag added for GCC >= 4.8
+-Wsuggest-attribute=format
diff --git a/config/gnu-warnings/cxx-general b/config/gnu-warnings/cxx-general
index 9548cc0..1626524 100644
--- a/config/gnu-warnings/cxx-general
+++ b/config/gnu-warnings/cxx-general
@@ -17,7 +17,6 @@
 -Winit-self
 -Winvalid-pch
 -Wmissing-include-dirs
--Wno-format-nonliteral
 -Wnon-virtual-dtor
 -Wold-style-cast
 -Woverloaded-virtual
diff --git a/config/gnu-warnings/developer-general b/config/gnu-warnings/developer-general
index b34c4b7..460b874 100644
--- a/config/gnu-warnings/developer-general
+++ b/config/gnu-warnings/developer-general
@@ -1,9 +1,6 @@
 # (suggestions from gcc, not code problems)
-# NOTE: -Wformat-nonliteral added back in here (from being disabled in
-# H5_CFLAGS)
 -Waggregate-return
 -Wdisabled-optimization
--Wformat-nonliteral
 -Winline
 -Wmissing-format-attribute
 -Wmissing-noreturn
diff --git a/config/gnu-warnings/gfort-5 b/config/gnu-warnings/developer-gfort-5
index c5d3850..c5d3850 100644
--- a/config/gnu-warnings/gfort-5
+++ b/config/gnu-warnings/developer-gfort-5
diff --git a/config/gnu-warnings/error-5 b/config/gnu-warnings/error-5
index f7e1138..282ee3f 100644
--- a/config/gnu-warnings/error-5
+++ b/config/gnu-warnings/error-5
@@ -1,4 +1,5 @@
 -Werror=incompatible-pointer-types
+-Werror=int-conversion
 #
 # In GCC 4.4.7, the compiler gripes about shadowed global
 # declarations when a local variable uses the name of a
diff --git a/config/gnu-warnings/error-8 b/config/gnu-warnings/error-8
index 2f54a4d..cbb25f6 100644
--- a/config/gnu-warnings/error-8
+++ b/config/gnu-warnings/error-8
@@ -1,7 +1,4 @@
-# NOTE: src/ files are not compatible with these warnings as errors
-#     src/H5Dchunk.c
-#       -Werror=cast-function-type
--Wcast-function-type
+-Werror=cast-function-type
 #
 # For GCC 8, promote maybe-initialized warnings to an error.  GCC 8
 # reports 0 maybe-uninitialized warnings where earlier versions
diff --git a/config/gnu-warnings/error-general b/config/gnu-warnings/error-general
index 8405c40..a66d284 100644
--- a/config/gnu-warnings/error-general
+++ b/config/gnu-warnings/error-general
@@ -11,6 +11,7 @@
 -Werror=packed
 -Werror=pointer-sign
 -Werror=pointer-to-int-cast
+-Werror=int-to-pointer-cast
 -Werror=redundant-decls
 -Werror=strict-prototypes
 -Werror=switch
diff --git a/config/gnu-warnings/general b/config/gnu-warnings/general
index a7a20b7..df4c613 100644
--- a/config/gnu-warnings/general
+++ b/config/gnu-warnings/general
@@ -15,18 +15,12 @@
 -Winit-self
 -Winvalid-pch
 -Wmissing-include-dirs
-#
+-Wshadow
+-Wundef
+-Wwrite-strings
+-pedantic
 # NOTE: Due to the divergence in the C and C++, we're dropping support for
 # compiling the C library with a C++ compiler and dropping the -Wc++-compat
 # warning.
 #
 -Wno-c++-compat
-#
-# NOTE: Disable the -Wformat-nonliteral from -Wformat=2 here and re-add
-# it to the developer flags.
-#
--Wno-format-nonliteral
--Wshadow
--Wundef
--Wwrite-strings
--pedantic
diff --git a/config/gnu-warnings/no-cxx-developer-4.8 b/config/gnu-warnings/no-cxx-developer-4.8
new file mode 100644
index 0000000..3c3de93
--- /dev/null
+++ b/config/gnu-warnings/no-cxx-developer-4.8
@@ -0,0 +1,9 @@
+# no-developer warning flag added for GCC >= 4.6
+-Wno-suggest-attribute=const
+
+# no-developer warning flags added for GCC >= 4.7
+-Wno-suggest-attribute=noreturn
+-Wno-suggest-attribute=pure
+
+# no-developer warning flag added for GCC >= 4.8
+-Wno-suggest-attribute=format