Merge pull request #1316 from asmorkalov:winrt_c4447_fix

modules/core/perf/perf_main.cpp

@@ -1,3 +1,8 @@
 #include "perf_precomp.hpp"
+#ifdef _MSC_VER
+# if _MSC_VER >= 1700
+#  pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
+# endif
+#endif
 
 CV_PERF_TEST_MAIN(core)

modules/core/src/system.cpp

@@ -42,6 +42,12 @@
 
 #include "precomp.hpp"
 
+#ifdef _MSC_VER
+# if _MSC_VER >= 1700
+#  pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
+# endif
+#endif
+
 #if defined WIN32 || defined _WIN32 || defined WINCE
 #ifndef _WIN32_WINNT           // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)
   #define _WIN32_WINNT 0x0400  // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx

modules/core/test/test_main.cpp

@@ -1,7 +1,10 @@
-#ifdef HAVE_WINRT
-    #pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
+#ifdef _MSC_VER
+# if _MSC_VER >= 1700
+#  pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
+# endif
 #endif
 
+
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")