X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52de37c78f31bc03f8b96090932c7ce8c3907d29..f24fc8367d4e9290b9fdbfd4b6fadb7b40846e9f:/include/wx/stringimpl.h?ds=sidebyside diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h index 1a581de5d1..c7029974c9 100644 --- a/include/wx/stringimpl.h +++ b/include/wx/stringimpl.h @@ -198,6 +198,7 @@ public: typedef ptr_type pointer; \ typedef int difference_type; \ \ + iterator_name() : m_ptr(NULL) { } \ iterator_name(pointer ptr) : m_ptr(ptr) { } \ \ reference operator*() const { return *m_ptr; } \ @@ -256,16 +257,16 @@ public: /* for wxStringImpl use only */ \ operator pointer() const { return m_ptr; } \ \ - friend class WXDLLIMPEXP_BASE wxStringImpl; \ + friend class wxStringImpl; \ \ pointer m_ptr // we need to declare const_iterator in wxStringImpl scope, the friend // declaration inside iterator class itself is not enough, or at least not // for g++ 3.4 (g++ 4 is ok) - class const_iterator; + class WXDLLIMPEXP_FWD_BASE const_iterator; - class iterator + class WXDLLIMPEXP_BASE iterator { WX_DEFINE_STRINGIMPL_ITERATOR(iterator, wxStringCharType&, @@ -274,7 +275,7 @@ public: friend class const_iterator; }; - class const_iterator + class WXDLLIMPEXP_BASE const_iterator { public: const_iterator(iterator i) : m_ptr(i.m_ptr) { } @@ -546,7 +547,7 @@ public: void DoUngetWriteBuf(); void DoUngetWriteBuf(size_t nLen); - friend class WXDLLIMPEXP_BASE wxString; + friend class WXDLLIMPEXP_FWD_BASE wxString; }; #endif // !wxUSE_STL_BASED_WXSTRING