Ignored warning preventing the server to build under VS 2015 update 2.

[casparcg] / common / compiler / vs / disable_silly_warnings.h

diff --git a/common/compiler/vs/disable_silly_warnings.h b/common/compiler/vs/disable_silly_warnings.h
index 492b9283938fd58b5c8c9827d0bfc412e823071a..dc81695176d45e24c5d523c39e6e404dbcd00582 100644 (file)
--- a/common/compiler/vs/disable_silly_warnings.h
+++ b/common/compiler/vs/disable_silly_warnings.h
@@ -1,35 +1,43 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-#if defined(_MSC_VER)\r
-#pragma warning (disable : 4100) // unreferenced formal parameter\r
-#pragma warning (disable : 4127) // conditional expression is constant\r
-#pragma warning (disable : 4180) // qualifier applied to function type has no meaning; ignored\r
-#pragma warning (disable : 4355) // 'this' : used in base member initializer list\r
-#pragma warning (disable : 4482) // nonstandard extension used: enum 'enum' used in qualified name\r
-#pragma warning (disable : 4503) // decorated name length exceeded, name was truncated\r
-#pragma warning (disable : 4512) // assignment operator could not be generated\r
-#pragma warning (disable : 4702) //  unreachable code\r
-#pragma warning (disable : 4714) // marked as __forceinline not inlined\r
-#pragma warning (disable : 4505) //  unreferenced local function has been removed\r
-#pragma warning (disable : 4481) //  nonstandard extension used: override specifier 'override'\r
-#endif\r
-\r
+/*
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
+*
+*  This file is part of CasparCG.
+*
+*    CasparCG is free software: you can redistribute it and/or modify
+*    it under the terms of the GNU General Public License as published by
+*    the Free Software Foundation, either version 3 of the License, or
+*    (at your option) any later version.
+*
+*    CasparCG is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*    GNU General Public License for more details.
+
+*    You should have received a copy of the GNU General Public License
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+#pragma once
+
+#if defined(_MSC_VER)
+#pragma warning (disable : 4100) // unreferenced formal parameter
+#pragma warning (disable : 4127) // conditional expression is constant
+#pragma warning (disable : 4180) // qualifier applied to function type has no meaning; ignored
+#pragma warning (disable : 4355) // 'this' : used in base member initializer list
+#pragma warning (disable : 4482) // nonstandard extension used: enum 'enum' used in qualified name
+#pragma warning (disable : 4503) // decorated name length exceeded, name was truncated
+#pragma warning (disable : 4512) // assignment operator could not be generated
+#pragma warning (disable : 4702) // unreachable code
+#pragma warning (disable : 4714) // marked as __forceinline not inlined
+#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
+#endif
+
+#endif
+