ICU-66108.tar.gz

[apple/icu.git] / icuSources / i18n / number_decimfmtprops.h

diff --git a/icuSources/i18n/number_decimfmtprops.h b/icuSources/i18n/number_decimfmtprops.h
index f288b6e0d97f58ff151470de4dec79f600fbabc1..b4e9b30dbb6f72017f6d394f2f17ed3524e15a39 100644 (file)
--- a/icuSources/i18n/number_decimfmtprops.h
+++ b/icuSources/i18n/number_decimfmtprops.h
@@ -21,10 +21,16 @@ 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
 // 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!=
 // Ignore warning 4661 as LocalPointerBase does not use operator== or operator!=

-#pragma warning(suppress: 4661)
+#pragma warning(push)
+#pragma warning(disable: 4661)
+#endif

 template class U_I18N_API LocalPointerBase<CurrencyPluralInfo>;
 template class U_I18N_API LocalPointer<CurrencyPluralInfo>;
 template class U_I18N_API LocalPointerBase<CurrencyPluralInfo>;
 template class U_I18N_API LocalPointer<CurrencyPluralInfo>;

+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif

 #endif
 
 namespace number {
 #endif
 
 namespace number {


@@ -134,6 +140,7 @@ struct U_I18N_API DecimalFormatProperties : public UMemory {
     NullableValue<RoundingMode> roundingMode;
     int32_t secondaryGroupingSize;
     bool signAlwaysShown;
     NullableValue<RoundingMode> roundingMode;
     int32_t secondaryGroupingSize;
     bool signAlwaysShown;

+    bool formatFullPrecision; // Apple addition for <rdar://problem/39240173>

 
     DecimalFormatProperties();
 
 
     DecimalFormatProperties();
 


@@ -149,6 +156,11 @@ struct U_I18N_API DecimalFormatProperties : public UMemory {
      */
     bool equalsDefaultExceptFastFormat() const;
 
      */
     bool equalsDefaultExceptFastFormat() const;
 

+    /**
+     * Returns the default DecimalFormatProperties instance.
+     */
+    static const DecimalFormatProperties& getDefault();
+

   private:
     bool _equals(const DecimalFormatProperties& other, bool ignoreForFastFormat) const;
 };
   private:
     bool _equals(const DecimalFormatProperties& other, bool ignoreForFastFormat) const;
 };