generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

~40 warnings under VS2008

Browse Source 
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
This commit is contained in:
Anatoly Baksheev
2011-06-11 17:24:09 +00:00
parent dc8572dc7b
commit 8f4c7db3f6
33 changed files with 343 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/cmdparser.cpp
View File

@@ -235,7 +235,7 @@ static _Tp fromStringNumber(const std::string& str)//the default conversion func
}
template<>
bool CommandLineParser::get<bool>(const std::string& name, const bool& default_value)
bool CommandLineParser::get<bool>(const std::string& name, const bool& /*default_value*/)
{
if (!has(name))
return false;

2
modules/core/src/precomp.hpp
View File

@@ -48,7 +48,7 @@
#pragma warning( disable: 4251 4711 4710 4514 )
#endif
#ifdef HAVE_CONFIG_H
#ifdef HAVE_CVCONFIG_H
#include "cvconfig.h"
#endif

7
modules/core/test/test_ds.cpp
View File

@@ -2023,7 +2023,14 @@ void Core_GraphScanTest::run( int )
event = "End of procedure";
break;
default:
#if _MSC_VER >= 1200
#pragma warning( push )
#pragma warning( disable : 4127 )
#endif
CV_TS_SEQ_CHECK_CONDITION( 0, "Invalid code appeared during graph scan" );
#if _MSC_VER >= 1200
#pragma warning( pop )
#endif
}
ts->printf( cvtest::TS::LOG, "%s", event );