From fb25206791c8324c946fb724f21c913b5f3b295e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 7 Jan 2008 01:46:42 +0000
Subject: [PATCH] compilation fix for MSVC: remove implicit
 wxStringImpl::iterator conversion to pointer as otherwise built-in
 operator+(void *, size_t) conflicts with our operator taking ptrdiff_t

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/stringimpl.h   | 8 ++++----
 src/common/stringimpl.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h
index 54b7af5919..7a9adb99bf 100644
--- a/include/wx/stringimpl.h
+++ b/include/wx/stringimpl.h
@@ -247,7 +247,7 @@ public:
                                                                               \
     private:                                                                  \
         /* for wxStringImpl use only */                                       \
-        operator pointer() const { return m_ptr; }                            \
+        pointer GetPtr() const { return m_ptr; }                              \
                                                                               \
         friend class wxStringImpl;                                            \
                                                                               \
@@ -401,7 +401,7 @@ public:
   wxStringImpl& append(size_t n, wxStringCharType ch);
     // append from first to last
   wxStringImpl& append(const_iterator first, const_iterator last)
-    { ConcatSelf(last - first, first); return *this; }
+    { ConcatSelf(last - first, first.GetPtr()); return *this; }
 
     // same as `this_string = str'
   wxStringImpl& assign(const wxStringImpl& str)
@@ -451,7 +451,7 @@ public:
   iterator insert(iterator it, wxStringCharType ch)
     { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }
   void insert(iterator it, const_iterator first, const_iterator last)
-    { insert(it - begin(), first, last - first); }
+    { insert(it - begin(), first.GetPtr(), last - first); }
   void insert(iterator it, size_type n, wxStringCharType ch)
     { insert(it - begin(), n, ch); }
 
@@ -498,7 +498,7 @@ public:
     { return replace(first - begin(), last - first, n, c); }
   wxStringImpl& replace(iterator first, iterator last,
                         const_iterator first1, const_iterator last1)
-    { return replace(first - begin(), last - first, first1, last1 - first1); }
+    { return replace(first - begin(), last - first, first1.GetPtr(), last1 - first1); }
 
     // swap two strings
   void swap(wxStringImpl& str);
diff --git a/src/common/stringimpl.cpp b/src/common/stringimpl.cpp
index 4c30917521..e182044be1 100644
--- a/src/common/stringimpl.cpp
+++ b/src/common/stringimpl.cpp
@@ -180,7 +180,7 @@ wxStringImpl::wxStringImpl(const_iterator first, const_iterator last)
 {
   if ( last >= first )
   {
-    InitWith(first, 0, last - first);
+    InitWith(first.GetPtr(), 0, last - first);
   }
   else
   {
-- 
2.45.2