ICU-59117.0.1.tar.gz

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

diff --git a/icuSources/common/unicode/uiter.h b/icuSources/common/unicode/uiter.h
index 963df5cf9f2d3f01130a8f0b4ac20e071b7ffb84..9792095e00092bf5630bb15dcc408bca1f7c5bf0 100644 (file)
--- a/icuSources/common/unicode/uiter.h
+++ b/icuSources/common/unicode/uiter.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-2004, International Business Machines
+*   Copyright (C) 2002-2011 International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  uiter.h
-*   encoding:   US-ASCII
+*   encoding:   UTF-8
 *   tab size:   8 (not used)
 *   indentation:4
 *
@@ -26,14 +28,14 @@
 
 #include "unicode/utypes.h"
 
-#ifdef XP_CPLUSPLUS
+#if U_SHOW_CPLUSPLUS_API
     U_NAMESPACE_BEGIN
 
     class CharacterIterator;
     class Replaceable;
 
     U_NAMESPACE_END
-#endif
+#endif // U_SHOW_CPLUSPLUS_API
 
 U_CDECL_BEGIN
 
@@ -650,7 +652,7 @@ uiter_setUTF16BE(UCharIterator *iter, const char *s, int32_t length);
 U_STABLE void U_EXPORT2
 uiter_setUTF8(UCharIterator *iter, const char *s, int32_t length);
 
-#ifdef XP_CPLUSPLUS
+#if U_SHOW_CPLUSPLUS_API
 
 /**
  * Set up a UCharIterator to wrap around a C++ CharacterIterator.
@@ -673,7 +675,7 @@ uiter_setUTF8(UCharIterator *iter, const char *s, int32_t length);
  * @stable ICU 2.1
  */
 U_STABLE void U_EXPORT2
-uiter_setCharacterIterator(UCharIterator *iter, CharacterIterator *charIter);
+uiter_setCharacterIterator(UCharIterator *iter, icu::CharacterIterator *charIter);
 
 /**
  * Set up a UCharIterator to iterate over a C++ Replaceable.
@@ -698,9 +700,9 @@ uiter_setCharacterIterator(UCharIterator *iter, CharacterIterator *charIter);
  * @stable ICU 2.1
  */
 U_STABLE void U_EXPORT2
-uiter_setReplaceable(UCharIterator *iter, const Replaceable *rep);
+uiter_setReplaceable(UCharIterator *iter, const icu::Replaceable *rep);
 
-#endif
+#endif // U_SHOW_CPLUSPLUS_API
 
 U_CDECL_END