mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1316 from asmorkalov:winrt_c4447_fix

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-21 19:24:25 +04:00 committed by OpenCV Buildbot
commit 9c60a2c24c
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/perf/perf_main.cpp
View File

@ -1,3 +1,8 @@
#include "perf_precomp.hpp" #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) CV_PERF_TEST_MAIN(core)

6
modules/core/src/system.cpp
View File

@ -42,6 +42,12 @@
#include "precomp.hpp" #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 #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?) #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 #define _WIN32_WINNT 0x0400 // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx

5
modules/core/test/test_main.cpp
View File

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