made new operator __alpha__ dependent

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index d9d59a835ce90d5fc681e135fbe497b29a420712..1ceea75a1c70603af8cca30eed679ba58ade2ed7 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -377,9 +377,13 @@ public:
     // operator version of GetChar
     wxChar  operator[](int n) const
       { ASSERT_VALID_INDEX( n ); return m_pchData[n]; }
     // operator version of GetChar
     wxChar  operator[](int n) const
       { ASSERT_VALID_INDEX( n ); return m_pchData[n]; }

+    // This is a rather ugly hack, but needed to resolve overloading
+    // conflicts on the AXP architecture:
+#ifdef __alpha__

     // operator version of GetChar
     wxChar  operator[](unsigned int n) const
       { ASSERT_VALID_INDEX( n ); return m_pchData[n]; }
     // operator version of GetChar
     wxChar  operator[](unsigned int n) const
       { ASSERT_VALID_INDEX( n ); return m_pchData[n]; }

+#endif

     // operator version of GetWritableChar
     wxChar& operator[](size_t n)
       { ASSERT_VALID_INDEX( n ); CopyBeforeWrite(); return m_pchData[n]; }
     // operator version of GetWritableChar
     wxChar& operator[](size_t n)
       { ASSERT_VALID_INDEX( n ); CopyBeforeWrite(); return m_pchData[n]; }