From 65fc4aecc85ebe03a0db0b78f33b9d08abbc5890 Mon Sep 17 00:00:00 2001 From: Geert-Jan Giezeman Date: Wed, 28 Apr 1999 20:19:32 +0000 Subject: [PATCH] Added namespace std prefix in places. --- .../Polygon/examples/Polygon/CustomPoint2.C | 2 +- Packages/Polygon/include/CGAL/Polygon_2.h | 4 +-- Packages/Polygon/test/Polygon/AlgorithmTest.C | 10 +++---- Packages/Polygon/test/Polygon/PolygonTest.C | 28 +++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Packages/Polygon/examples/Polygon/CustomPoint2.C b/Packages/Polygon/examples/Polygon/CustomPoint2.C index e89bb342e69..7a562f027de 100644 --- a/Packages/Polygon/examples/Polygon/CustomPoint2.C +++ b/Packages/Polygon/examples/Polygon/CustomPoint2.C @@ -59,7 +59,7 @@ MyVector operator-(const MyPoint& p, const MyPoint& q) // MySegment //-----------------------------------------------------------------------// -typedef pair MySegment; +typedef std::pair MySegment; ostream& operator<<(ostream& to, const MySegment& e) { diff --git a/Packages/Polygon/include/CGAL/Polygon_2.h b/Packages/Polygon/include/CGAL/Polygon_2.h index 3e7942ca359..6bf6b27699d 100644 --- a/Packages/Polygon/include/CGAL/Polygon_2.h +++ b/Packages/Polygon/include/CGAL/Polygon_2.h @@ -158,7 +158,7 @@ class Polygon_2 { #else template Polygon_2(InputIterator first, InputIterator last) - { copy(first, last, back_inserter(d_container)); } + { std::copy(first, last, std::back_inserter(d_container)); } #endif //-------------------------------------------------------- @@ -191,7 +191,7 @@ class Polygon_2 { return; typename _Container::iterator i = d_container.begin(); - reverse(++i, d_container.end()); + std::reverse(++i, d_container.end()); } //-------------------------------------------------------- diff --git a/Packages/Polygon/test/Polygon/AlgorithmTest.C b/Packages/Polygon/test/Polygon/AlgorithmTest.C index fe6c565325e..8bf16c19f72 100644 --- a/Packages/Polygon/test/Polygon/AlgorithmTest.C +++ b/Packages/Polygon/test/Polygon/AlgorithmTest.C @@ -29,16 +29,16 @@ void test_polygon(const R&, const Point&, const char* FileName) std::vector polygon; from >> point; - copy(istream_iterator(from), - istream_iterator(), - back_inserter(polygon) + std::copy(std::istream_iterator(from), + std::istream_iterator(), + std::back_inserter(polygon) ); // show the point and the polygon cout << "point: " << point << endl; cout << "polygon:" << endl; - copy(polygon.begin(), polygon.end(), - ostream_iterator(cout, "\n")); + std::copy(polygon.begin(), polygon.end(), + std::ostream_iterator(cout, "\n")); cout << endl; iterator left = diff --git a/Packages/Polygon/test/Polygon/PolygonTest.C b/Packages/Polygon/test/Polygon/PolygonTest.C index 7bbf98a9a06..3a06b6a5918 100644 --- a/Packages/Polygon/test/Polygon/PolygonTest.C +++ b/Packages/Polygon/test/Polygon/PolygonTest.C @@ -86,9 +86,9 @@ void test_iterators(ListPolygon& p, const ListPolygon& q) { VC v = p.vertices_circulator(); - iterator_category(v); - value_type(v); - distance_type(v); + std::iterator_category(v); + std::value_type(v); + std::distance_type(v); VC vstart(v); if (v != 0) @@ -101,9 +101,9 @@ void test_iterators(ListPolygon& p, const ListPolygon& q) cout << *vi << endl; EC e = p.edges_circulator(); - iterator_category(e); - value_type(e); - distance_type(e); + std::iterator_category(e); + std::value_type(e); + std::distance_type(e); EC estart(e); if (e != 0) @@ -112,16 +112,16 @@ void test_iterators(ListPolygon& p, const ListPolygon& q) ++e; } while (e != estart); - for (EI ei = p.edges_begin(); ei != p.edges_end(); ++ei) + for (EI ei = p.edges_begin(); p.edges_end() != ei; ++ei) cout << *ei << endl; } //-------------------------------------------------------------------// { VCC v = q.vertices_circulator(); - iterator_category(v); - value_type(v); - distance_type(v); + std::iterator_category(v); + std::value_type(v); + std::distance_type(v); VCC vstart(v); if (v != 0) @@ -134,9 +134,9 @@ void test_iterators(ListPolygon& p, const ListPolygon& q) cout << *vi << endl; EC e = q.edges_circulator(); - iterator_category(e); - value_type(e); - distance_type(e); + std::iterator_category(e); + std::value_type(e); + std::distance_type(e); EC estart(e); if (e != 0) @@ -270,7 +270,7 @@ void test_update_operations(const ListPolygon& p, VI middle = q.vertices_begin(); VI last = q.vertices_end(); ++middle; - rotate(first, middle, last); + std::rotate(first, middle, last); assert(p==q); // test update operations