diff --git a/modules/features2d/src/calonder.cpp b/modules/features2d/src/calonder.cpp index fd9925c47..695801645 100644 --- a/modules/features2d/src/calonder.cpp +++ b/modules/features2d/src/calonder.cpp @@ -413,7 +413,7 @@ static float percentile(float *data, int n, float p) assert(n>0); assert(p>=0 && p<=1); std::vector vec(data, data+n); - sort(vec.begin(), vec.end()); + std::sort(vec.begin(), vec.end()); int ix = (int)(p*(n-1)); return vec[ix]; } @@ -1299,7 +1299,7 @@ static float percentile( const float* data, int n, float p ) assert( p>=0 && p<=1 ); vector vec( data, data+n ); - sort(vec.begin(), vec.end()); + std::sort(vec.begin(), vec.end()); int ix = (int)(p*(n-1)); return vec[ix]; } diff --git a/modules/haartraining/createsamples.cpp b/modules/haartraining/createsamples.cpp index 02aa92952..71debcc94 100644 --- a/modules/haartraining/createsamples.cpp +++ b/modules/haartraining/createsamples.cpp @@ -50,6 +50,8 @@ #include #include +using namespace std; + #include "cvhaartraining.h" int main( int argc, char* argv[] ) diff --git a/modules/haartraining/haartraining.cpp b/modules/haartraining/haartraining.cpp index 9347b54bb..f85a3c1f5 100644 --- a/modules/haartraining/haartraining.cpp +++ b/modules/haartraining/haartraining.cpp @@ -49,6 +49,8 @@ #include #include +using namespace std; + #include "cvhaartraining.h" int main( int argc, char* argv[] ) diff --git a/modules/imgproc/src/_kdtree.hpp b/modules/imgproc/src/_kdtree.hpp index fe1d66405..b46c99588 100644 --- a/modules/imgproc/src/_kdtree.hpp +++ b/modules/imgproc/src/_kdtree.hpp @@ -337,7 +337,7 @@ private: // add bbf_node for alternate branch in priority queue pq.push_back(bbf_node(alt_n, dist)); - push_heap(pq.begin(), pq.end()); + std::push_heap(pq.begin(), pq.end()); } // called by bbf to walk to leaf; @@ -374,11 +374,11 @@ private: bbf_nn nn(p, distance(d, p)); if ((int) nn_pq.size() < k) { nn_pq.push_back(nn); - push_heap(nn_pq.begin(), nn_pq.end()); + std::push_heap(nn_pq.begin(), nn_pq.end()); } else if (nn_pq[0].dist > nn.dist) { - pop_heap(nn_pq.begin(), nn_pq.end()); + std::pop_heap(nn_pq.begin(), nn_pq.end()); nn_pq.end()[-1] = nn; - push_heap(nn_pq.begin(), nn_pq.end()); + std::push_heap(nn_pq.begin(), nn_pq.end()); } assert(nn_pq.size() < 2 || nn_pq[0].dist >= nn_pq[1].dist); } @@ -405,7 +405,7 @@ public: while (tmp_pq.size() && emax > 0) { // from node nearest query point d, run to leaf - pop_heap(tmp_pq.begin(), tmp_pq.end()); + std::pop_heap(tmp_pq.begin(), tmp_pq.end()); bbf_node bbf(tmp_pq.end()[-1]); tmp_pq.erase(tmp_pq.end() - 1); diff --git a/tests/cv/src/acameracalibration.cpp b/tests/cv/src/acameracalibration.cpp index f387e6638..665ba4782 100644 --- a/tests/cv/src/acameracalibration.cpp +++ b/tests/cv/src/acameracalibration.cpp @@ -1610,9 +1610,9 @@ double CV_StereoCalibrationTest_C::calibrateStereoCamera( const vector(cv::Mat(&amat)), umat2); cvFlip(&amat, &amat, 0); if(nr2 > 0) - sort(ar2.begin(), ar2.begin()+nr2, pred_double()); + std::sort(ar2.begin(), ar2.begin()+nr2, pred_double()); ar2.resize(nr2); int nr1 = 0; diff --git a/tests/cxts/cxts.cpp b/tests/cxts/cxts.cpp index 37c38cb42..269572fea 100644 --- a/tests/cxts/cxts.cpp +++ b/tests/cxts/cxts.cpp @@ -886,8 +886,8 @@ void CvTest::run( int start_from ) break; } - sort(v_cpe.begin(), v_cpe.end()); - sort(v_time.begin(), v_time.end()); + std::sort(v_cpe.begin(), v_cpe.end()); + std::sort(v_time.begin(), v_time.end()); t_cpu_acc = v_cpe[i/2]; t_acc = v_time[i/2];