ICU-57131.0.1.tar.gz

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

diff --git a/icuSources/i18n/decfmtst.h b/icuSources/i18n/decfmtst.h
index 5e3d7d3b998007d8f92bddd36764a8373b151ea2..3c774a3249b5284d8c4699272e3777f3c2a923b3 100644 (file)
--- a/icuSources/i18n/decfmtst.h
+++ b/icuSources/i18n/decfmtst.h
@@ -1,21 +1,24 @@
-//
-//  decfmtst.h
-//
-//  Copyright (C) 2009, International Business Machines Corporation and others.
-//  All Rights Reserved.
-//
-//  This file contains declarations for the class DecimalFormatStaticSets
-//
-//  DecimalFormatStaticSets holds the UnicodeSets that are needed for lenient
-//  parsing of decimal and group separators.
-//
+/*
+*******************************************************************************
+* Copyright (C) 2009-2016, International Business Machines Corporation and
+* others. All Rights Reserved.
+*******************************************************************************
+*
+* This file contains declarations for the class DecimalFormatStaticSets
+*
+* DecimalFormatStaticSets holds the UnicodeSets that are needed for lenient
+* parsing of decimal and group separators.
+********************************************************************************
+*/

 
 #ifndef DECFMTST_H
 #define DECFMTST_H
 
 #include "unicode/utypes.h"
 
 
 #ifndef DECFMTST_H
 #define DECFMTST_H
 
 #include "unicode/utypes.h"
 

- #if !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/uobject.h"

 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 


@@ -25,16 +28,17 @@ class  UnicodeSet;
 class DecimalFormatStaticSets : public UMemory
 {
 public:
 class DecimalFormatStaticSets : public UMemory
 {
 public:

-    static DecimalFormatStaticSets *gStaticSets;  // Ptr to all lazily initialized constant
-                                                  //   shared sets.
-
-    DecimalFormatStaticSets(UErrorCode *status);
+    // Constructor and Destructor not for general use.
+    //   Public to permit access from plain C implementation functions.
+    DecimalFormatStaticSets(UErrorCode &status);

     ~DecimalFormatStaticSets();
 
     ~DecimalFormatStaticSets();
 

-    static void    initSets(UErrorCode *status);
-    static UBool   cleanup();
+    /**
+      * Return a pointer to a lazy-initialized singleton instance of this class.
+      */
+    static const DecimalFormatStaticSets *getStaticSets(UErrorCode &status);

 
 

-    static UnicodeSet *getSimilarDecimals(UChar32 decimal, UBool strictParse, UnicodeSet *fallback);
+    static const UnicodeSet *getSimilarDecimals(UChar32 decimal, UBool strictParse);

 
     UnicodeSet *fDotEquivalents;
     UnicodeSet *fCommaEquivalents;
 
     UnicodeSet *fDotEquivalents;
     UnicodeSet *fCommaEquivalents;


@@ -49,6 +53,11 @@ public:
     UnicodeSet *fDefaultGroupingSeparators;
     UnicodeSet *fStrictDefaultGroupingSeparators;
 
     UnicodeSet *fDefaultGroupingSeparators;
     UnicodeSet *fStrictDefaultGroupingSeparators;
 

+    UnicodeSet *fMinusSigns;
+    UnicodeSet *fPlusSigns;
+private:
+    void cleanup();
+

 };
 
 
 };