mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#pragma warning4127 fixation modified

Browse Source 
Now use cleaner approach:

#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
This commit is contained in:
jaco 2014-08-13 17:59:16 +02:00
parent 58b3bc2d7e
commit b81dcbdf2a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/include/opencv2/core/cvstd.inl.hpp
View File

@ -49,10 +49,6 @@
# include <ostream> # include <ostream>
#endif #endif
#ifdef _MSC_VER
#pragma warning( disable: 4127 )
#endif
namespace cv namespace cv
{ {
#ifndef OPENCV_NOSTL #ifndef OPENCV_NOSTL
@ -224,7 +220,10 @@ std::ostream& operator << (std::ostream& out, const Vec<_Tp, n>& vec)
{ {
out << "["; out << "[";
#pragma warning( push )
#pragma warning( disable: 4127 )
if(Vec<_Tp, n>::depth < CV_32F) if(Vec<_Tp, n>::depth < CV_32F)
#pragma warning( pop )
{ {
for (int i = 0; i < n - 1; ++i) { for (int i = 0; i < n - 1; ++i) {
out << (int)vec[i] << ", "; out << (int)vec[i] << ", ";