From 9183da066e07f3e9105bf4cec9e3e8c1ddb04b72 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Dec 2007 00:55:03 +0000 Subject: [PATCH] no need to reenable VC warning 4251 now as it's globally disabled in wx/defs.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 10 ---------- include/wx/strvararg.h | 8 -------- 2 files changed, 18 deletions(-) diff --git a/include/wx/string.h b/include/wx/string.h index c3cf3c9b03..7c4bf74d87 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -2587,12 +2587,6 @@ private: private: wxStringImpl m_impl; -#ifdef __VISUALC__ - // "struct 'ConvertedBuffer' needs to have dll-interface to be used by - // clients of class 'wxString'" - this is private, we don't care - #pragma warning (disable:4251) -#endif - // buffers for compatibility conversion from (char*)c_str() and // (wchar_t*)c_str(): // FIXME-UTF8: bechmark various approaches to keeping compatibility buffers @@ -2621,10 +2615,6 @@ private: ConvertedBuffer m_convertedToWChar; #endif -#ifdef __VISUALC__ - #pragma warning (default:4251) -#endif - #if wxUSE_UNICODE_UTF8 // FIXME-UTF8: (try to) move this elsewhere (TLS) or solve differently // assigning to character pointer to by wxString::interator may diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index e60392d2f7..4cbe39b3aa 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -124,11 +124,6 @@ class WXDLLIMPEXP_FWD_BASE wxString; // accounts for string changes done by wxArgNormalizer<> // // Note that this class can _only_ be used for function arguments! -#ifdef __VISUALC__ - // "struct 'wx[W]CharBuffer' needs to have dll-interface to be used by - // clients of class 'wxString'" - this is private, we don't care - #pragma warning (disable:4251) -#endif class WXDLLIMPEXP_BASE wxFormatString { public: @@ -185,9 +180,6 @@ private: private: wxCharBuffer m_char; wxWCharBuffer m_wchar; -#ifdef __VISUALC__ - #pragma warning (default:4251) -#endif // NB: we can use a pointer here, because wxFormatString is only used // as function argument, so it has shorter life than the string