From: Helge Norberg Date: Tue, 12 Apr 2016 08:18:23 +0000 (+0200) Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0 X-Git-Tag: 2.1.0_Beta1~85 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a660f13c38fbd89c3db2169449baa5e2268db815;hp=e08a8faecce4a485e375967b923c4afc35ee3d3c;p=casparcg Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0 --- diff --git a/common/compiler/vs/disable_silly_warnings.h b/common/compiler/vs/disable_silly_warnings.h index 8996c740e..dc8169517 100644 --- a/common/compiler/vs/disable_silly_warnings.h +++ b/common/compiler/vs/disable_silly_warnings.h @@ -32,6 +32,8 @@ #pragma warning (disable : 4505) // unreferenced local function has been #pragma warning (disable : 4481) // nonstandard extension used: override specifier 'override' #pragma warning (disable : 4996) // function call with parameters that may be unsafe +#pragma warning (disable : 4334) // '<<': result of 32 - bit shift implicitly converted to 64 bits(was 64 - bit shift intended ?) + #if (_MSC_VER > 1800 && _MSC_FULL_VER >= 190023506) #pragma warning( disable : 4592) // symbol will be dynamically initialized (implementation limitation). Bug in VS2015 14.0.24720.00 Update 1