diff --git a/Packages/Triangulation_2/examples/Triangulation_2/example.C b/Packages/Triangulation_2/examples/Triangulation_2/example.C index db818ee55d9..c1a25a883b2 100644 --- a/Packages/Triangulation_2/examples/Triangulation_2/example.C +++ b/Packages/Triangulation_2/examples/Triangulation_2/example.C @@ -117,8 +117,8 @@ void input_from_file(Triangulation &T, is >> n; std::cout << "Reading " << n << " points" << std::endl; - std::istream_iterator begin(is); - std::istream_iterator end; + std::istream_iterator begin(is); + std::istream_iterator end; T.insert(begin, end); } @@ -158,7 +158,8 @@ void faces_along_line(Triangulation &T) count++; } }while(++lfc != done); - std::cout << "The line intersects " << count << " finite faces" << std::endl; + std::cout << "The line intersects " + << count << " finite faces" << std::endl; } } @@ -186,13 +187,13 @@ void fileIO(Triangulation &T, { std::cout << "The triangulation will be written to a file and read again\n"; { - ofstream out("tr"); + std::ofstream out("tr"); CGAL::set_ascii_mode(out); out << T << std::endl; } Triangulation T2; - ifstream in("tr"); + std::ifstream in("tr"); CGAL::set_ascii_mode(in); in >> T2; assert( T2.is_valid() ); diff --git a/Packages/Triangulation_2/examples/Triangulation_2/points.C b/Packages/Triangulation_2/examples/Triangulation_2/points.C index 0ca60ae8e8a..77655764e05 100644 --- a/Packages/Triangulation_2/examples/Triangulation_2/points.C +++ b/Packages/Triangulation_2/examples/Triangulation_2/points.C @@ -38,7 +38,7 @@ int main(int argc, char* argv[]) T.insert(V[i]); if(++count == 100){ - cout << "."; + std::cout << "."; count = 0; } } diff --git a/Packages/Triangulation_2/examples/Triangulation_2/points.h b/Packages/Triangulation_2/examples/Triangulation_2/points.h index 5f0e459c230..bb034d76611 100644 --- a/Packages/Triangulation_2/examples/Triangulation_2/points.h +++ b/Packages/Triangulation_2/examples/Triangulation_2/points.h @@ -47,7 +47,7 @@ private: -ostream& operator<<(ostream& os, const point& p) +std::ostream& operator<<(std::ostream& os, const point& p) { os << "(" << p.x() << ", " << p.y() << ")"; return os; @@ -72,7 +72,7 @@ public: }; -ostream& operator<< (ostream& os, const dir& d) +std::ostream& operator<< (std::ostream& os, const dir& d) { os << "(" << d.x() << ", " << d.y() << ")"; return os; @@ -123,7 +123,7 @@ private: point *_s, *_t; }; -ostream& operator<<(ostream& os, const segment& s) +std::ostream& operator<<(std::ostream& os, const segment& s) { os << "(" << *(s.source()) << ", " << *(s.target()) << ")"; return os; @@ -172,7 +172,7 @@ private: point *_p, *_q, *_r; }; -ostream& operator<<(ostream& os, const triangle& t) +std::ostream& operator<<(std::ostream& os, const triangle& t) { os << "(" << t.vertex(0) << ", " << t.vertex(1) << ", " << t.vertex(2) << ")"; return os; @@ -181,7 +181,7 @@ ostream& operator<<(ostream& os, const triangle& t) class ray { -friend ostream& operator<< (ostream&, const ray&); +friend std::ostream& operator<< (std::ostream&, const ray&); protected: point _p; @@ -194,7 +194,7 @@ public: dir d() const { return _d; } }; -ostream& operator<<(ostream& os, const ray& r) +std::ostream& operator<<(std::ostream& os, const ray& r) { os << r.p() << "+" << r.d(); return os; @@ -234,7 +234,7 @@ public: _size = n; } - void read(istream& is) + void read(std::istream& is) { int n; is >> n; @@ -255,7 +255,7 @@ private: int _size; }; -istream& operator>>(istream& is, PVector &pv) +std::istream& operator>>(std::istream& is, PVector &pv) { pv.read(is); return is; @@ -297,7 +297,7 @@ public: const Point &r) const { if(*p==*q || *p == *r || *q == *r){ - cout << "coll" << endl; + std::cout << "coll" << std::endl; return CGAL::COLLINEAR; } return CGAL::orientationC2(p->x(), p->y(), q->x(), q->y(), r->x(), r->y()); @@ -309,7 +309,7 @@ public: const Point &r) const { if(*p==*q || *p == *r || *q == *r){ - cout << "coll" << endl; + std::cout << "coll" << std::endl; return CGAL::COLLINEAR; } return CGAL::orientationC2(p->x(), p->y(), q->x(), q->y(), r->x(), r->y()); diff --git a/Packages/Triangulation_2/examples/Triangulation_2/voronoi.C b/Packages/Triangulation_2/examples/Triangulation_2/voronoi.C index 08f6bc3a619..b3d1507aecf 100644 --- a/Packages/Triangulation_2/examples/Triangulation_2/voronoi.C +++ b/Packages/Triangulation_2/examples/Triangulation_2/voronoi.C @@ -125,8 +125,8 @@ void input_from_file(Triangulation &T, is >> n; std::cout << "Reading " << n << " points" << std::endl; - std::istream_iterator begin(is); - std::istream_iterator end; + std::istream_iterator begin(is); + std::istream_iterator end; T.insert(begin, end); }