Kaydet (Commit) 8de63bac authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror=sign-promo from cppunit

üst d06a78c2
--- 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 @@
static std::string toString( const T& x )
{
OStringStream ost;
+// Work around "passing 'T' chooses 'int' over 'unsigned int'" warnings when T
+// is an enum type:
+#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-promo"
+#endif
ost << x;
+#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
return ost.str();
}
};
...@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 ...@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download> # cppunit-1.12.1.tar.gz/download>
PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch cppunit-1.12.1-warnings.patch
# solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912590&group_id=11795&atid=311795>; upstreamed as # aid=2912590&group_id=11795&atid=311795>; upstreamed as
# <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= # <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=
...@@ -55,6 +55,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix ...@@ -55,6 +55,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
# SAL_UNUSED_PARAMETER in sal/types.h); upstreamed as # SAL_UNUSED_PARAMETER in sal/types.h); upstreamed as
# <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= # <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=
# 7a09bf3a88e99d85c4dec2ad296309dbec2987c3> # 7a09bf3a88e99d85c4dec2ad296309dbec2987c3>
# cppunit-1.12.1-warnings.patch: work around additional warnings (found when
# converting module unotest to gbuild)
.IF "$(OS)" == "ANDROID" .IF "$(OS)" == "ANDROID"
PATCH_FILES += android.patch PATCH_FILES += android.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment