From 4728eac0b73136d5697c840050ce7b99057cd04b Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Fri, 14 Mar 2025 13:25:56 -0700
Subject: [PATCH] ICU-23004 string_view::iterator not always a pointer

---
 icu4c/source/common/unicode/utfiter.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/icu4c/source/common/unicode/utfiter.h b/icu4c/source/common/unicode/utfiter.h
index b1c61004357..37f2aa0e873 100644
--- a/icu4c/source/common/unicode/utfiter.h
+++ b/icu4c/source/common/unicode/utfiter.h
@@ -1324,12 +1324,12 @@ public:
     UTFStringCodePoints &operator=(const UTFStringCodePoints &other) = default;
 
     /** @draft ICU 78 */
-    UTFIterator<CP32, behavior, const Unit *> begin() const {
+    UTFIterator<CP32, behavior, typename std::basic_string_view<Unit>::iterator> begin() const {
         return {s.begin(), s.begin(), s.end()};
     }
 
     /** @draft ICU 78 */
-    UTFIterator<CP32, behavior, const Unit *> end() const {
+    UTFIterator<CP32, behavior, typename std::basic_string_view<Unit>::iterator> end() const {
         return {s.begin(), s.end(), s.end()};
     }
 
@@ -1866,12 +1866,12 @@ public:
     UnsafeUTFStringCodePoints &operator=(const UnsafeUTFStringCodePoints &other) = default;
 
     /** @draft ICU 78 */
-    UnsafeUTFIterator<CP32, const Unit *> begin() const {
+    UnsafeUTFIterator<CP32, typename std::basic_string_view<Unit>::iterator> begin() const {
         return {s.begin()};
     }
 
     /** @draft ICU 78 */
-    UnsafeUTFIterator<CP32, const Unit *> end() const {
+    UnsafeUTFIterator<CP32, typename std::basic_string_view<Unit>::iterator> end() const {
         return {s.end()};
     }