Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / arrstr.h

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index bd37a1f00075d982a2be04e4be9610ecea42ecea..e093c29731da3958be025fbc2dcac1c897ee9c22 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -28,7 +28,7 @@ inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
     return wxStringSortAscending(s2, s1);
 }
 
     return wxStringSortAscending(s2, s1);
 }
 

-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS

 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 


@@ -100,7 +100,7 @@ private:
     }
 };
 
     }
 };
 

-#else // if !wxUSE_STL
+#else // if !wxUSE_STD_CONTAINERS

 
 // this shouldn't be defined for compilers not supporting template methods or
 // without std::distance()
 
 // this shouldn't be defined for compilers not supporting template methods or
 // without std::distance()


@@ -252,7 +252,7 @@ public:
   public:
     pointer m_ptr;
     reverse_iterator() : m_ptr(NULL) { }
   public:
     pointer m_ptr;
     reverse_iterator() : m_ptr(NULL) { }

-    reverse_iterator(pointer ptr) : m_ptr(ptr) { }
+    wxEXPLICIT reverse_iterator(pointer ptr) : m_ptr(ptr) { }

     reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
     pointer operator->() const { return m_ptr; }
     reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
     pointer operator->() const { return m_ptr; }


@@ -278,7 +278,7 @@ public:
   public:
     pointer m_ptr;
     const_reverse_iterator() : m_ptr(NULL) { }
   public:
     pointer m_ptr;
     const_reverse_iterator() : m_ptr(NULL) { }

-    const_reverse_iterator(pointer ptr) : m_ptr(ptr) { }
+    wxEXPLICIT const_reverse_iterator(pointer ptr) : m_ptr(ptr) { }

     const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
     const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }


@@ -384,7 +384,7 @@ public:
     { Copy(array); }
 };
 
     { Copy(array); }
 };
 

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS

 
 // this class provides a temporary wxString* from a
 // wxArrayString
 
 // this class provides a temporary wxString* from a
 // wxArrayString


@@ -425,7 +425,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // by default, these functions use the escape character to escape the
 // ----------------------------------------------------------------------------
 
 // by default, these functions use the escape character to escape the

-// separators occuring inside the string to be joined, this can be disabled by
+// separators occurring inside the string to be joined, this can be disabled by

 // passing '\0' as escape
 
 WXDLLIMPEXP_BASE wxString wxJoin(const wxArrayString& arr,
 // passing '\0' as escape
 
 WXDLLIMPEXP_BASE wxString wxJoin(const wxArrayString& arr,