ICU-59117.0.1.tar.gz

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

diff --git a/icuSources/i18n/unicode/ucol.h b/icuSources/i18n/unicode/ucol.h
index 8b44716e7e83c4e15681f421f62c5795e039a418..e577265628550a24d14f3fecd56a90151ea45bd5 100644 (file)
--- a/icuSources/i18n/unicode/ucol.h
+++ b/icuSources/i18n/unicode/ucol.h
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 *******************************************************************************
 * Copyright (c) 1996-2015, International Business Machines Corporation and others.
 /*
 *******************************************************************************
 * Copyright (c) 1996-2015, International Business Machines Corporation and others.


@@ -123,8 +125,13 @@ typedef enum {
   /** upper case sorts before lower case */
   UCOL_UPPER_FIRST = 25,
 
   /** upper case sorts before lower case */
   UCOL_UPPER_FIRST = 25,
 

+#ifndef U_HIDE_DEPRECATED_API
+    /**
+     * One more than the highest normal UColAttributeValue value.
+     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     */

   UCOL_ATTRIBUTE_VALUE_COUNT
   UCOL_ATTRIBUTE_VALUE_COUNT

-
+#endif  /* U_HIDE_DEPRECATED_API */

 } UColAttributeValue;
 
 /**
 } UColAttributeValue;
 
 /**


@@ -191,12 +198,13 @@ typedef enum {
     * @stable ICU 4.8
     */    
     UCOL_REORDER_CODE_DIGIT         = 0x1004,
     * @stable ICU 4.8
     */    
     UCOL_REORDER_CODE_DIGIT         = 0x1004,

-   /**
-    * The limit of the reorder codes. This is intended for use in range checking 
-    * and enumeration of the reorder codes.
-    * @stable ICU 4.8
-    */    
+#ifndef U_HIDE_DEPRECATED_API
+    /**
+     * One more than the highest normal UColReorderCode value.
+     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     */

     UCOL_REORDER_CODE_LIMIT         = 0x1005
     UCOL_REORDER_CODE_LIMIT         = 0x1005

+#endif  /* U_HIDE_DEPRECATED_API */

 } UColReorderCode;
 
 /**
 } UColReorderCode;
 
 /**


@@ -333,10 +341,13 @@ typedef enum {
       * @stable ICU 2.8
       */
      UCOL_NUMERIC_COLLATION = UCOL_STRENGTH + 2, 
       * @stable ICU 2.8
       */
      UCOL_NUMERIC_COLLATION = UCOL_STRENGTH + 2, 

-     /**
-      * The number of UColAttribute constants.
-      * @stable ICU 2.0
-      */
+
+    /* Do not conditionalize the following with #ifndef U_HIDE_DEPRECATED_API,
+     * it is needed for layout of RuleBasedCollator object. */
+    /**
+     * One more than the highest normal UColAttribute value.
+     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     */

      UCOL_ATTRIBUTE_COUNT
 } UColAttribute;
 
      UCOL_ATTRIBUTE_COUNT
 } UColAttribute;
 


@@ -528,7 +539,7 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalUCollatorPointer, UCollator, ucol_close);
 
 U_NAMESPACE_END
 
 
 U_NAMESPACE_END
 

-#endif
+#endif // U_SHOW_CPLUSPLUS_API

 
 /**
  * Compare two strings.
 
 /**
  * Compare two strings.


@@ -1050,7 +1061,13 @@ typedef enum {
   UCOL_BOUND_UPPER = 1,
   /** upper bound that will match all the strings that have the same initial substring as the given string */
   UCOL_BOUND_UPPER_LONG = 2,
   UCOL_BOUND_UPPER = 1,
   /** upper bound that will match all the strings that have the same initial substring as the given string */
   UCOL_BOUND_UPPER_LONG = 2,

-  UCOL_BOUND_VALUE_COUNT
+#ifndef U_HIDE_DEPRECATED_API
+    /**
+     * One more than the highest normal UColBoundMode value.
+     * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+     */
+    UCOL_BOUND_VALUE_COUNT
+#endif  /* U_HIDE_DEPRECATED_API */

 } UColBoundMode;
 
 /**
 } UColBoundMode;
 
 /**