Merge pull request #415 from drakmor/2.1.0

Fix compilation in VS2015 version 14.0.24720.00 Update 1

diff --git a/common/compiler/vs/disable_silly_warnings.h b/common/compiler/vs/disable_silly_warnings.h
index 0866ef7a353f4ead2efcf1c3912dbe2cc70af571..8996c740ed83be7769da542753021be1639e63ff 100644 (file)
--- a/common/compiler/vs/disable_silly_warnings.h
+++ b/common/compiler/vs/disable_silly_warnings.h
@@ -32,5 +32,10 @@
 #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
+
+#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