[Libreoffice-commits] .: i18npool/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Sep 14 06:04:00 PDT 2012


 i18npool/source/textconversion/textconversion_ko.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0d4c44bb9a9283778abd4be52c44b76bcf6a068c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Sep 14 16:03:08 2012 +0300

    GCC/Clang pragma dance
    
    Change-Id: I42f9f45bffbbc74784eb78580a5b927aa3d3ffd7

diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 2d13c1e..dfb21e0 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -142,11 +142,13 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos
 #else
 #ifdef LIBO_WERROR
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
+#ifdef __clang__
 #pragma GCC diagnostic warning "-Wbool-conversions"
+#else
 #pragma GCC diagnostic warning "-Waddress"
 #endif
 #endif
+#endif
     if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount && getHangul2HanjaData) {
         ch = aText[nStartPos];
         const Hangul_Index *Hangul_ko = getHangul2HanjaIndex();


More information about the Libreoffice-commits mailing list