Removing 'using namespace std' from header files, closes bugs #730 and #846

2011-02-16 06:36:15 +00:00
parent 6b34532901
commit 7d42dbdd71
22 changed files with 110 additions and 126 deletions
--- a/modules/flann/include/opencv2/flann/sampling.h
+++ b/modules/flann/include/opencv2/flann/sampling.h
@@ -56,7 +56,7 @@ Matrix<T> random_sample(Matrix<T>& srcMatrix, long size, bool remove = false)
            dest = srcMatrix[srcMatrix.rows-i-1];
            src = srcMatrix[r];
            for (size_t j=0;j<srcMatrix.cols;++j) {
-                swap(*src,*dest);
+                std::swap(*src,*dest);
                src++;
                dest++;
            }