------------------------------------------------------------ revno: 2292 committer: poy <[email protected]> branch nick: trunk timestamp: Sat 2010-11-13 17:40:25 +0100 message: clear out the dwt MSVC include file modified: SConstruct dwt/include/dwt/VCDesktopHeaders.h
-- lp:dcplusplus https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk Your team Dcplusplus-team is subscribed to branch lp:dcplusplus. To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'SConstruct' --- SConstruct 2010-10-29 15:30:05 +0000 +++ SConstruct 2010-11-13 16:40:25 +0000 @@ -22,6 +22,7 @@ # 4121: alignment of member sensitive to packing # 4127: conditional expression is constant # 4189: var init'd, unused + # 4244: possible loss of data on conversion # 4290: exception spec ignored # 4355: "this" used in a constructor # 4510: no default constructor @@ -30,7 +31,7 @@ # 4706: assignment within conditional expression # 4800: converting from BOOL to bool # 4996: fn unsafe, use fn_s - 'common' : ['/W4', '/EHsc', '/Zi', '/GR', '/wd4100', '/wd4121', '/wd4127', '/wd4189', '/wd4290', '/wd4355', '/wd4510', '/wd4512', '/wd4610', '/wd4706', '/wd4800', '/wd4996'], + 'common' : ['/W4', '/EHsc', '/Zi', '/GR', '/wd4100', '/wd4121', '/wd4127', '/wd4189', '/wd4244', '/wd4290', '/wd4355', '/wd4510', '/wd4512', '/wd4610', '/wd4706', '/wd4800', '/wd4996'], 'debug' : ['/MDd'], 'release' : ['/MD', '/O2'] } === modified file 'dwt/include/dwt/VCDesktopHeaders.h' --- dwt/include/dwt/VCDesktopHeaders.h 2010-02-11 21:44:13 +0000 +++ dwt/include/dwt/VCDesktopHeaders.h 2010-11-13 16:40:25 +0000 @@ -40,36 +40,6 @@ #error This file is only for MSVC #endif -// We don't want the stupid "pointer trunctation" to 64 bit architecture warning. -// The warnings aren't justified anyway since they are basically a bug in 7.1 -// release... E.g. the SetWindowLongPtr is defined as SetWindowLong in 32 bits mode -// but will in 64 bits mode be defined as the 64 bits equivalent version, therefore -// it will give you a 64 bit compile warning when this file is compiled with -// warning level 4 (MSVC) -#pragma warning( disable : 4244 ) -#pragma warning( disable : 4312 ) -#pragma warning( disable : 4311 ) - -#endif - - #define SMARTWIN_WNDCLASSEX WNDCLASSEX - #define SmartWinRegisterClass RegisterClassEx - -#pragma comment( lib, "Comdlg32.lib" ) -#pragma comment( lib, "comctl32.lib" ) - -#ifdef DLL - #ifdef _DEBUG - #ifdef _UNICODE - #pragma comment( lib, "SmartWinDU.lib" ) - #else - #pragma comment( lib, "SmartWinD.lib" ) - #endif - #else - #ifdef _UNICODE - #pragma comment( lib, "SmartWinU.lib" ) - #else - #pragma comment( lib, "SmartWin.lib" ) - #endif - #endif +// implement compatibility shims for MSVC here + #endif
_______________________________________________ Mailing list: https://launchpad.net/~linuxdcpp-team Post to : [email protected] Unsubscribe : https://launchpad.net/~linuxdcpp-team More help : https://help.launchpad.net/ListHelp
