ICU-64232.0.1.tar.gz

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

diff --git a/icuSources/common/unicode/uenum.h b/icuSources/common/unicode/uenum.h
index 3917ffe1b5fb44a0ce0560bfe515849d0e60ae77..0f14444a3e8237acb69d7d6ad9cd647fc24723e9 100644 (file)
--- a/icuSources/common/unicode/uenum.h
+++ b/icuSources/common/unicode/uenum.h
@@ -1,12 +1,14 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2002-2012, International Business Machines
+*   Copyright (C) 2002-2013, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  uenum.h
-*   encoding:   US-ASCII
+*   encoding:   UTF-8
 *   tab size:   8 (not used)
 *   indentation:2
 *
@@ -21,8 +23,10 @@
 #include "unicode/localpointer.h"
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/strenum.h"
-#endif
+U_NAMESPACE_BEGIN
+class StringEnumeration;
+U_NAMESPACE_END
+#endif // U_SHOW_CPLUSPLUS_API
 
 /**
  * \file
@@ -65,7 +69,7 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalUEnumerationPointer, UEnumeration, uenum_close)
 
 U_NAMESPACE_END
 
-#endif
+#endif // U_SHOW_CPLUSPLUS_API
 
 /**
  * Returns the number of elements that the iterator traverses.  If
@@ -169,9 +173,8 @@ uenum_reset(UEnumeration* en, UErrorCode* status);
 U_STABLE UEnumeration* U_EXPORT2
 uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec);
 
-#endif
+#endif // U_SHOW_CPLUSPLUS_API
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * Given an array of const UChar* strings, return a UEnumeration.  String pointers from 0..count-1 must not be null.
  * Do not free or modify either the string array or the characters it points to until this object has been destroyed with uenum_close.
@@ -181,14 +184,11 @@ uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec)
  * @param ec error code
  * @return the new UEnumeration object. Caller is responsible for calling uenum_close to free memory.
  * @see uenum_close
- * @draft ICU 50
+ * @stable ICU 50
  */
-U_DRAFT UEnumeration* U_EXPORT2
+U_STABLE UEnumeration* U_EXPORT2
 uenum_openUCharStringsEnumeration(const UChar* const strings[], int32_t count,
                                  UErrorCode* ec);
-#endif
-
-/* Note:  next function is not hidden as draft, as it is used internally (it was formerly an internal function). */
 
 /**
  * Given an array of const char* strings (invariant chars only), return a UEnumeration.  String pointers from 0..count-1 must not be null.
@@ -199,11 +199,10 @@ uenum_openUCharStringsEnumeration(const UChar* const strings[], int32_t count,
  * @param ec error code
  * @return the new UEnumeration object. Caller is responsible for calling uenum_close to free memory
  * @see uenum_close
- * @draft ICU 50
+ * @stable ICU 50
  */
-U_DRAFT UEnumeration* U_EXPORT2
+U_STABLE UEnumeration* U_EXPORT2
 uenum_openCharStringsEnumeration(const char* const strings[], int32_t count,
                                  UErrorCode* ec);
 
-
 #endif