summaryrefslogtreecommitdiffstats
path: root/vigra/makefile.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-29 14:03:08 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-03-29 14:04:18 +0200
commit31d26fb9b85cd54267e1a5c0d5a3595e8bb4884c (patch)
tree45d858b996ff97e1d3071524029890add6d7ee8c /vigra/makefile.mk
parentBackport some Boost 1.48.0 changes to keep GCC 4.7 -std=c++11 happy (diff)
downloadcore-31d26fb9b85cd54267e1a5c0d5a3595e8bb4884c.tar.gz
core-31d26fb9b85cd54267e1a5c0d5a3595e8bb4884c.zip
GCC 4.7 -Werror=enum-compare
Diffstat (limited to 'vigra/makefile.mk')
-rw-r--r--vigra/makefile.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
index c8e4f7779809..6cee4b0c84d5 100644
--- a/vigra/makefile.mk
+++ b/vigra/makefile.mk
@@ -55,6 +55,13 @@ PATCH_FILES=$(TARFILE_NAME).patch
PATCH_FILES += vigra1.4.0-unused-parameters.patch
.END
+# At least GCC 4.7 treats more correctly now the type of enumerators prior to
+# the closing brace of the enum-specifier (see [dcl.enum] in the C++ 2003
+# Standard), leading to "comparison between <enum1> and <enum2> [-Werror=enum-
+# compare]" and "enumeral mismatch in conditional expression [-Werror]"
+# warnings:
+PATCH_FILES += vigra1.4.0-enumwarn.patch
+
CONFIGURE_DIR=
CONFIGURE_ACTION=