From c3291233c4d384ec9642b1ccc368cfb9411e18db Mon Sep 17 00:00:00 2001 From: Jeff Genovy Date: Tue, 8 Jan 2019 17:56:40 -0800 Subject: [PATCH] ICU-20325 Fix warnings about unknown pragma when building with GCC in MSYS2 (Windows). --- icu4c/source/i18n/erarules.h | 2 ++ icu4c/source/i18n/number_decimfmtprops.h | 2 ++ icu4c/source/i18n/number_patternmodifier.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/icu4c/source/i18n/erarules.h b/icu4c/source/i18n/erarules.h index 4ed86408325..8324b4c0df4 100644 --- a/icu4c/source/i18n/erarules.h +++ b/icu4c/source/i18n/erarules.h @@ -18,8 +18,10 @@ U_NAMESPACE_BEGIN // When building DLLs for Windows this is required even though no direct access leaks out of the i18n library. // See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples. #if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN +#if defined(_MSC_VER) // Ignore warning 4661 as LocalPointerBase does not use operator== or operator!= #pragma warning(suppress: 4661) +#endif template class U_I18N_API LocalPointerBase; template class U_I18N_API LocalMemory; #endif diff --git a/icu4c/source/i18n/number_decimfmtprops.h b/icu4c/source/i18n/number_decimfmtprops.h index f288b6e0d97..4819cbd9247 100644 --- a/icu4c/source/i18n/number_decimfmtprops.h +++ b/icu4c/source/i18n/number_decimfmtprops.h @@ -21,8 +21,10 @@ U_NAMESPACE_BEGIN // data member of CurrencyPluralInfoWrapper. // (When building DLLs for Windows this is required.) #if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN +#if defined(_MSC_VER) // Ignore warning 4661 as LocalPointerBase does not use operator== or operator!= #pragma warning(suppress: 4661) +#endif template class U_I18N_API LocalPointerBase; template class U_I18N_API LocalPointer; #endif diff --git a/icu4c/source/i18n/number_patternmodifier.h b/icu4c/source/i18n/number_patternmodifier.h index 9e6e33fccae..89c5457c67b 100644 --- a/icu4c/source/i18n/number_patternmodifier.h +++ b/icu4c/source/i18n/number_patternmodifier.h @@ -21,8 +21,10 @@ U_NAMESPACE_BEGIN // data member of AdoptingModifierStore. // (When building DLLs for Windows this is required.) #if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN +#if defined(_MSC_VER) // Ignore warning 4661 as LocalPointerBase does not use operator== or operator!= #pragma warning(suppress: 4661) +#endif template class U_I18N_API LocalPointerBase; template class U_I18N_API LocalPointer; #endif