From: jaco <f.puja@yahoo.it>
Date: Wed, 13 Aug 2014 15:59:16 +0000 (+0200)
Subject: #pragma warning4127 fixation modified
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3011^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b81dcbdf2a0db0770893630d5cf38c2a3b3d5041;p=platform%2Fupstream%2Fopencv.git

#pragma warning4127 fixation modified

Now use cleaner approach:

#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
---

diff --git a/modules/core/include/opencv2/core/cvstd.inl.hpp b/modules/core/include/opencv2/core/cvstd.inl.hpp
index 7e4c387..f43798e 100644
--- a/modules/core/include/opencv2/core/cvstd.inl.hpp
+++ b/modules/core/include/opencv2/core/cvstd.inl.hpp
@@ -49,10 +49,6 @@
 #  include <ostream>
 #endif
 
-#ifdef _MSC_VER
-#pragma warning( disable: 4127 )
-#endif
-
 namespace cv
 {
 #ifndef OPENCV_NOSTL
@@ -224,7 +220,10 @@ std::ostream& operator << (std::ostream& out, const Vec<_Tp, n>& vec)
 {
     out << "[";
 
+#pragma warning( push )
+#pragma warning( disable: 4127 )
     if(Vec<_Tp, n>::depth < CV_32F)
+#pragma warning( pop )
     {
         for (int i = 0; i < n - 1; ++i) {
             out << (int)vec[i] << ", ";