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

Remove obsolete MSVC version tests.

Browse Source 
Don't compare __VISUALC__ with versions 1200 (VC6) and earlier, such tests are
always true or always false now that we don't support VC6 any more, so just
remove them simplifying the code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-16 13:01:29 +00:00
parent 15f255cebb
commit 8c7d31e615
15 changed files with 25 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/defs.h
View File

@@ -1267,9 +1267,7 @@ inline wxUIntPtr wxPtrToUInt(const void *p)
doing here. Same thing with icc with -Wall.
*/
#ifdef __VISUALC__
#if __VISUALC__ >= 1200
#pragma warning(push)
#endif
#pragma warning(push)
/* pointer truncation from '' to '' */
#pragma warning(disable: 4311)
#elif defined(__INTELC__)
@@ -1280,7 +1278,7 @@ inline wxUIntPtr wxPtrToUInt(const void *p)
return wx_reinterpret_cast(wxUIntPtr, p);
#if (defined(__VISUALC__) && __VISUALC__ >= 1200) || defined(__INTELC__)
#if defined(__VISUALC__) || defined(__INTELC__)
#pragma warning(pop)
#endif
}
@@ -1288,9 +1286,7 @@ inline wxUIntPtr wxPtrToUInt(const void *p)
inline void *wxUIntToPtr(wxUIntPtr p)
{
#ifdef __VISUALC__
#if __VISUALC__ >= 1200
#pragma warning(push)
#endif
#pragma warning(push)
/* conversion to type of greater size */
#pragma warning(disable: 4312)
#elif defined(__INTELC__)
@@ -1301,7 +1297,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
return wx_reinterpret_cast(void *, p);
#if (defined(__VISUALC__) && __VISUALC__ >= 1200) || defined(__INTELC__)
#if defined(__VISUALC__) || defined(__INTELC__)
#pragma warning(pop)
#endif
}