ICU-59180.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / unicode / ulocdata.h

diff --git a/icuSources/i18n/unicode/ulocdata.h b/icuSources/i18n/unicode/ulocdata.h
index 25dd3ecc91364d0c57d027ae386cec9113559358..cbb8bfd866aeb6592116246dbfa714fe7295dc87 100644 (file)
--- a/icuSources/i18n/unicode/ulocdata.h
+++ b/icuSources/i18n/unicode/ulocdata.h
@@ -1,12 +1,14 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

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

-* Copyright (C) 2003-2014, International Business Machines                   *
+* Copyright (C) 2003-2015, International Business Machines                   *

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

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

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


@@ -47,8 +49,13 @@ typedef enum ULocaleDataExemplarSetType  {
     ULOCDATA_ES_INDEX=2,
     /** Punctuation set @stable ICU 51 */
     ULOCDATA_ES_PUNCTUATION=3,
     ULOCDATA_ES_INDEX=2,
     /** Punctuation set @stable ICU 51 */
     ULOCDATA_ES_PUNCTUATION=3,

-    /** One higher than the last valid type @stable ICU 3.4 */
+#ifndef U_HIDE_DEPRECATED_API
+    /**
+     * One more than the highest normal ULocaleDataExemplarSetType value.
+     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     */

     ULOCDATA_ES_COUNT=4
     ULOCDATA_ES_COUNT=4

+#endif  /* U_HIDE_DEPRECATED_API */

 } ULocaleDataExemplarSetType;
 
 /** The possible types of delimiters.
 } ULocaleDataExemplarSetType;
 
 /** The possible types of delimiters.


@@ -63,8 +70,13 @@ typedef enum ULocaleDataDelimiterType {
     ULOCDATA_ALT_QUOTATION_START = 2,
     /** Alternate quotation end @stable ICU 3.4 */
     ULOCDATA_ALT_QUOTATION_END = 3,
     ULOCDATA_ALT_QUOTATION_START = 2,
     /** Alternate quotation end @stable ICU 3.4 */
     ULOCDATA_ALT_QUOTATION_END = 3,

-    /** One higher than the last valid type @stable ICU 3.4 */
+#ifndef U_HIDE_DEPRECATED_API
+    /**
+     * One more than the highest normal ULocaleDataDelimiterType value.
+     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     */

     ULOCDATA_DELIMITER_COUNT = 4
     ULOCDATA_DELIMITER_COUNT = 4

+#endif  /* U_HIDE_DEPRECATED_API */

 } ULocaleDataDelimiterType;
 
 /**
 } ULocaleDataDelimiterType;
 
 /**


@@ -104,7 +116,7 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalULocaleDataPointer, ULocaleData, ulocdata_close
 
 U_NAMESPACE_END
 
 
 U_NAMESPACE_END
 

-#endif
+#endif // U_SHOW_CPLUSPLUS_API

 
 /**
  * Sets the "no Substitute" attribute of the locale data
 
 /**
  * Sets the "no Substitute" attribute of the locale data


@@ -186,9 +198,16 @@ ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type, UChar *re
  * @stable ICU 2.8
  */
 typedef enum UMeasurementSystem {
  * @stable ICU 2.8
  */
 typedef enum UMeasurementSystem {

-    UMS_SI,     /** Measurement system specified by SI otherwise known as Metric system. */
-    UMS_US,     /** Measurement system followed in the United States of America. */
+    UMS_SI,     /**< Measurement system specified by SI otherwise known as Metric system. @stable ICU 2.8 */
+    UMS_US,     /**< Measurement system followed in the United States of America. @stable ICU 2.8 */
+    UMS_UK,     /**< Mix of metric and imperial units used in Great Britain. @stable ICU 55 */
+#ifndef U_HIDE_DEPRECATED_API
+    /**
+     * One more than the highest normal UMeasurementSystem value.
+     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     */

     UMS_LIMIT
     UMS_LIMIT

+#endif  /* U_HIDE_DEPRECATED_API */

 } UMeasurementSystem;
 
 /**
 } UMeasurementSystem;
 
 /**