ICU-59117.0.1.tar.gz

[apple/icu.git] / icuSources / common / unicode / listformatter.h

diff --git a/icuSources/common/unicode/listformatter.h b/icuSources/common/unicode/listformatter.h
index e48faaa1276c70b8bc38a7fe6cda237a6f5f24af..4cedeebd20fbe927dd615f4416df469ead8cefbc 100644 (file)
--- a/icuSources/common/unicode/listformatter.h
+++ b/icuSources/common/unicode/listformatter.h
@@ -1,12 +1,14 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 *******************************************************************************
 *
 /*
 *******************************************************************************
 *

-*   Copyright (C) 2012-2014, International Business Machines
+*   Copyright (C) 2012-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  listformatter.h
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  listformatter.h

-*   encoding:   US-ASCII
+*   encoding:   UTF-8

 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   tab size:   8 (not used)
 *   indentation:4
 *


@@ -22,6 +24,7 @@
 #include "unicode/unistr.h"
 #include "unicode/locid.h"
 
 #include "unicode/unistr.h"
 #include "unicode/locid.h"
 

+#if U_SHOW_CPLUSPLUS_API

 U_NAMESPACE_BEGIN
 
 /** @internal */
 U_NAMESPACE_BEGIN
 
 /** @internal */


@@ -145,7 +148,7 @@ class U_COMMON_API ListFormatter : public UObject{
     /**
      * @internal constructor made public for testing.
      */
     /**
      * @internal constructor made public for testing.
      */

-    ListFormatter(const ListFormatData &data);
+    ListFormatter(const ListFormatData &data, UErrorCode &errorCode);

     /**
      * @internal constructor made public for testing.
      */
     /**
      * @internal constructor made public for testing.
      */


@@ -155,6 +158,8 @@ class U_COMMON_API ListFormatter : public UObject{
   private:
     static void initializeHash(UErrorCode& errorCode);
     static const ListFormatInternal* getListFormatInternal(const Locale& locale, const char *style, UErrorCode& errorCode);
   private:
     static void initializeHash(UErrorCode& errorCode);
     static const ListFormatInternal* getListFormatInternal(const Locale& locale, const char *style, UErrorCode& errorCode);

+    struct ListPatternsSink;
+    static ListFormatInternal* loadListFormatInternal(const Locale& locale, const char* style, UErrorCode& errorCode);

 
     ListFormatter();
 
 
     ListFormatter();
 


@@ -163,5 +168,6 @@ class U_COMMON_API ListFormatter : public UObject{
 };
 
 U_NAMESPACE_END
 };
 
 U_NAMESPACE_END

+#endif // U_SHOW_CPLUSPLUS_API

 
 #endif
 
 #endif