From 25d0f92c21b71d316059c0b70ddf71dec6d7fd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 18 Aug 2018 16:04:27 +0200 Subject: [PATCH] Fix FTBFS with stricter C++11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 6494172e98ea4244cefede4afeb1c950ef4ebc6e) --- kalarm/functions.cpp | 2 +- tderesources/groupwise/soap/stdsoap2.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index b92e3f3e..9ae28740 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -1053,7 +1053,7 @@ bool runKOrganizer() } if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { - kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl; + kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl; return false; } } diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp index 834051c5..72c464d2 100644 --- a/tderesources/groupwise/soap/stdsoap2.cpp +++ b/tderesources/groupwise/soap/stdsoap2.cpp @@ -7362,7 +7362,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen) } *s++ = '/'; break; - case '<' | 0x80000000: + case (soap_wchar)('<' | 0x80000000): if (flag) *s++ = '<'; else @@ -7371,7 +7371,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen) m = 3; } break; - case '>' | 0x80000000: + case (soap_wchar)('>' | 0x80000000): if (flag) *s++ = '>'; else @@ -7380,7 +7380,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen) m = 3; } break; - case '&' | 0x80000000: + case (soap_wchar)('&' | 0x80000000): if (flag) *s++ = '&'; else @@ -7389,7 +7389,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen) m = 4; } break; - case '"' | 0x80000000: + case (soap_wchar)('"' | 0x80000000): if (flag) *s++ = '"'; else @@ -7398,7 +7398,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen) m = 5; } break; - case '\'' | 0x80000000: + case (soap_wchar)('\'' | 0x80000000): if (flag) *s++ = '\''; else