From adcc13ac81119f349762f579e90a9610f6a39e8c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 7 Jun 2009 12:27:07 +0000 Subject: [PATCH] disable MSVC warning 4275 which is harmless and can't be avoided anyhow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/ustring.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/wx/ustring.h b/include/wx/ustring.h index 68494d5767..a59d46b307 100644 --- a/include/wx/ustring.h +++ b/include/wx/ustring.h @@ -31,6 +31,12 @@ typedef wxCharTypeBuffer wxU32CharBuffer; typedef wxScopedCharTypeBuffer wxScopedU32CharBuffer; #endif +#ifdef __VISUALC__ + // "non dll-interface class 'std::basic_string' used as base + // interface for dll-interface class 'wxString'" -- this is OK in our case + // (and warning is unavoidable anyhow) + #pragma warning(disable:4275) +#endif class WXDLLIMPEXP_BASE wxUString: public std::basic_string { @@ -589,6 +595,10 @@ public: }; +#ifdef __VISUALC__ + #pragma warning(default:4275) +#endif + inline wxUString operator+(const wxUString &s1, const wxUString &s2) { wxUString ret( s1 ); ret.append( s2 ); return ret; } inline wxUString operator+(const wxUString &s1, const char *s2) -- 2.45.2