Commit b81dcbdf authored by jaco's avatar jaco

#pragma warning4127 fixation modified

Now use cleaner approach:

#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
parent 58b3bc2d
...@@ -49,10 +49,6 @@ ...@@ -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) ...@@ -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] << ", ";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment