ICU-62141.0.1.tar.gz

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

diff --git a/icuSources/i18n/tridpars.h b/icuSources/i18n/tridpars.h
index b916a9a98497cc4b20876d4002e808db149975c5..5e42f068a47cd710437ed88aa6c1260ec95e625c 100644 (file)
--- a/icuSources/i18n/tridpars.h
+++ b/icuSources/i18n/tridpars.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
  **************************************************************************
- *   Copyright (c) 2002-2004, International Business Machines Corporation *
+ *   Copyright (c) 2002-2010, International Business Machines Corporation *
  *   and others.  All Rights Reserved.                                    *
  **************************************************************************
  *   Date        Name        Description                                  *
@@ -147,7 +149,7 @@ class TransliteratorIDParser /* not : public UObject because all methods are sta
      * @param dir the direction.
      * @param withParens INPUT-OUTPUT parameter.  On entry, if
      * withParens[0] is 0, then parens are disallowed.  If it is 1,
-     * then parens are requires.  If it is -1, then parens are
+     * then parens are required.  If it is -1, then parens are
      * optional, and the return result will be set to 0 or 1.
      * @param canonID OUTPUT parameter.  The pattern for the filter
      * added to the canonID, either at the end, if dir is FORWARD, or
@@ -202,23 +204,15 @@ class TransliteratorIDParser /* not : public UObject because all methods are sta
      * the reverse.  THIS MAY RESULT IN AN EMPTY VECTOR.  Convert
      * SingleID entries to actual transliterators.
      *
-     * Also, optionally, insert the given transliterator at the given
-     * position.  This effectively happens before anything else.
-     *
      * @param list vector of SingleID objects.  On exit, vector
      * of one or more Transliterators.
-     * @param insert Transliterator to insert, or null if none.
-     * @param insertIndex index from 0..list.size()-1, at which
-     * to place 'insert', or -1 if none.
      * @param ec Output param to receive a success or an error code.
      * @return new value of insertIndex.  The index will shift if
      * there are empty items, like "(Lower)", with indices less than
      * insertIndex.
      */
-    static int32_t instantiateList(UVector& list,
-                                   Transliterator* insert,
-                                   int32_t insertIndex,
-                                   UErrorCode& ec);
+    static void instantiateList(UVector& list,
+                                UErrorCode& ec);
 
     /**
      * Parse an ID into pieces.  Take IDs of the form T, T/V, S-T,
@@ -357,7 +351,7 @@ class TransliteratorIDParser /* not : public UObject because all methods are sta
     /**
      * Initialize static memory.
      */
-    static void init(UErrorCode &status);
+    static void U_CALLCONV init(UErrorCode &status);
 
     friend class SingleID;
 };