summaryrefslogtreecommitdiff
path: root/cppunit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-02-10 15:00:53 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-02-10 15:02:25 +0100
commit8b65733bbd2ad8d789b8665588cb3d71554ef229 (patch)
treef84c86e3308cca56e9b8a82d10f480b78d6d8269 /cppunit
parent2b1758a2dc82200468905f7865468972a691b6a3 (diff)
-Werror=sign-promo from cppunit; old GCC redux
Diffstat (limited to 'cppunit')
-rw-r--r--cppunit/cppunit-1.12.1-warnings.patch15
1 files changed, 14 insertions, 1 deletions
diff --git a/cppunit/cppunit-1.12.1-warnings.patch b/cppunit/cppunit-1.12.1-warnings.patch
index 8941de76d124..c2429d714f1a 100644
--- a/cppunit/cppunit-1.12.1-warnings.patch
+++ b/cppunit/cppunit-1.12.1-warnings.patch
@@ -1,6 +1,19 @@
--- misc/cppunit-1.12.1/include/cppunit/TestAssert.h 2012-02-10 12:34:26.564961982 +0100
+++ misc/build/cppunit-1.12.1/include/cppunit/TestAssert.h 2012-02-10 12:33:57.660131866 +0100
-@@ -46,7 +46,16 @@
+@@ -8,6 +8,12 @@
+ #include <stdio.h>
+ #include <float.h> // For struct assertion_traits<double>
+
++// Work around "passing 'T' chooses 'int' over 'unsigned int'" warnings when T
++// is an enum type:
++#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
++#pragma GCC system_header
++#endif
++
+
+ CPPUNIT_NS_BEGIN
+
+@@ -46,7 +52,16 @@
static std::string toString( const T& x )
{
OStringStream ost;