X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/582886dde50f379f1a10d1b241917a0c0346a4c8..9ab4a4384550eea08bc1eae2c4a2c36525336a80:/include/wx/string.h

diff --git a/include/wx/string.h b/include/wx/string.h
index a67e8e8fb9..c5658d9fc4 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -209,7 +209,7 @@ inline int Stricmp(const char *psz1, const char *psz2)
 
 // Lightweight object returned by wxString::c_str() and implicitly convertible
 // to either const char* or const wchar_t*.
-class WXDLLIMPEXP_BASE wxCStrData
+class wxCStrData
 {
 private:
     // Ctors; for internal use by wxString and wxCStrData only
@@ -1004,8 +1004,8 @@ public:
         { return iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); }
 
   private:
-      iterator(wxString *str, underlying_iterator ptr)
-          : m_cur(ptr), m_node(str, &m_cur) {}
+      iterator(wxString *wxstr, underlying_iterator ptr)
+          : m_cur(ptr), m_node(wxstr, &m_cur) {}
 
       wxString* str() const { return const_cast<wxString*>(m_node.m_str); }
 
@@ -1049,8 +1049,8 @@ public:
 
   private:
       // for internal wxString use only:
-      const_iterator(const wxString *str, underlying_iterator ptr)
-          : m_cur(ptr), m_node(str, &m_cur) {}
+      const_iterator(const wxString *wxstr, underlying_iterator ptr)
+          : m_cur(ptr), m_node(wxstr, &m_cur) {}
 
       const wxString* str() const { return m_node.m_str; }