cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused code inside MSVC 6 version checks

Browse Source 
We don't support MSVC 6 (__VISUALC__ == 1200) or eVC (1201) since more
than 5 years (see f4b80e5337), so it's
useless to keep code compiled only when this compiler is used.
This commit is contained in:
Vadim Zeitlin 2019-10-21 20:32:28 +02:00
parent f867b04571
commit 416fc8582d
3 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/msvc/wx/setup.h
View File

@ -54,9 +54,7 @@
#ifdef wxMSVC_VERSION #ifdef wxMSVC_VERSION
#define wxCOMPILER_PREFIX wxCONCAT(vc, wxMSVC_VERSION) #define wxCOMPILER_PREFIX wxCONCAT(vc, wxMSVC_VERSION)
#elif defined(wxMSVC_VERSION_AUTO) || defined(wxMSVC_VERSION_ABI_COMPAT) #elif defined(wxMSVC_VERSION_AUTO) || defined(wxMSVC_VERSION_ABI_COMPAT)
#if _MSC_VER == 1200 #if _MSC_VER == 1300
#define wxCOMPILER_PREFIX vc60
#elif _MSC_VER == 1300
#define wxCOMPILER_PREFIX vc70 #define wxCOMPILER_PREFIX vc70
#elif _MSC_VER == 1310 #elif _MSC_VER == 1310
#define wxCOMPILER_PREFIX vc71 #define wxCOMPILER_PREFIX vc71

5
include/wx/afterstd.h
View File

@ -16,11 +16,6 @@
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #endif
// undo what we did in wx/beforestd.h
#if defined(__VISUALC__) && __VISUALC__ <= 1201
#pragma warning(pop)
#endif
// see beforestd.h for explanation // see beforestd.h for explanation
#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY) #if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
#pragma GCC visibility pop #pragma GCC visibility pop

27
include/wx/beforestd.h
View File

@ -19,33 +19,6 @@
it can be included several times. it can be included several times.
*/ */
// VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which
// defines _MSC_VER as 1201) does need to be included as it's VC6-like
#if defined(__VISUALC__) && __VISUALC__ <= 1201
// these warning have to be disabled and not just temporarily disabled
// because they will be given at the end of the compilation of the
// current source and there is absolutely nothing we can do about them so
// disable them before warning(push) below
// 'foo': unreferenced inline function has been removed
#pragma warning(disable:4514)
// 'function' : function not inlined
#pragma warning(disable:4710)
// 'id': identifier was truncated to 'num' characters in the debug info
#pragma warning(disable:4786)
// we have to disable (and reenable in afterstd.h) this one because,
// even though it is of level 4, it is not disabled by warning(push, 1)
// below for VC7.1!
// unreachable code
#pragma warning(disable:4702)
#pragma warning(push, 1)
#endif // VC++ < 7
/** /**
GCC's visibility support is broken for libstdc++ in some older versions GCC's visibility support is broken for libstdc++ in some older versions
(namely Debian/Ubuntu's GCC 4.1, see (namely Debian/Ubuntu's GCC 4.1, see