X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/57a6839dcb3bba09e8228b822b290604668416fe..f3c0d7a59d99c2a94c6b8822291f0e42be3773c9:/icuSources/common/unicode/listformatter.h diff --git a/icuSources/common/unicode/listformatter.h b/icuSources/common/unicode/listformatter.h index 1b321958..4cedeebd 100644 --- 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 -* encoding: US-ASCII +* encoding: UTF-8 * tab size: 8 (not used) * indentation:4 * @@ -22,6 +24,7 @@ #include "unicode/unistr.h" #include "unicode/locid.h" +#if U_SHOW_CPLUSPLUS_API U_NAMESPACE_BEGIN /** @internal */ @@ -65,13 +68,13 @@ class U_COMMON_API ListFormatter : public UObject{ /** * Copy constructor. - * @draft ICU 52 + * @stable ICU 52 */ ListFormatter(const ListFormatter&); /** * Assignment operator. - * @draft ICU 52 + * @stable ICU 52 */ ListFormatter& operator=(const ListFormatter& other); @@ -145,7 +148,7 @@ class U_COMMON_API ListFormatter : public UObject{ /** * @internal constructor made public for testing. */ - ListFormatter(const ListFormatData &data); + ListFormatter(const ListFormatData &data, UErrorCode &errorCode); /** * @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); + struct ListPatternsSink; + static ListFormatInternal* loadListFormatInternal(const Locale& locale, const char* style, UErrorCode& errorCode); ListFormatter(); @@ -163,5 +168,6 @@ class U_COMMON_API ListFormatter : public UObject{ }; U_NAMESPACE_END +#endif // U_SHOW_CPLUSPLUS_API #endif