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
This commit is contained in:
parent
32aa5bda92
commit
9183da066e
@ -2587,12 +2587,6 @@ private:
|
||||
private:
|
||||
wxStringImpl m_impl;
|
||||
|
||||
#ifdef __VISUALC__
|
||||
// "struct 'ConvertedBuffer<T>' 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<wchar_t> 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
|
||||
|
@ -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<T>' 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
|
||||
|
Loading…
Reference in New Issue
Block a user