X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80df4d3169daf180af22992d46fcc12b61e4a64a..b3daa5a32277ef8f31390f7a178ea14735b3f069:/include/wx/strconv.h diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 2b76ae9859..92d5729370 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -20,6 +20,9 @@ #include "wx/wxchar.h" #include "wx/buffer.h" +#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 +# undef __BSEXCPT__ +#endif #include #if wxUSE_WCHAR_T @@ -43,7 +46,7 @@ public: const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); } const wxCharBuffer cWX2MB(const wchar_t *psz) const { return cWC2MB(psz); } const wchar_t* cWC2WX(const wchar_t *psz) const { return psz; } - const wchar_t* cMB2WC(const wchar_t *psz) const { return psz; } + const wchar_t* cWX2WC(const wchar_t *psz) const { return psz; } #else // ANSI const char* cMB2WX(const char *psz) const { return psz; } const char* cWX2MB(const char *psz) const { return psz; }