use pragma warning push/pop under MSVC instead of enabling temporarily disabled warnings unconditionally (patch 1207689)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,6 +32,7 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
|
||||
|
||||
// avoid triggering this stupid VC++ warning
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4355) // 'this' used in base member initializer list
|
||||
#endif
|
||||
|
||||
@@ -96,7 +97,7 @@ private:
|
||||
};
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(default:4355)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user