Changing iostream.h --> iostream

Fixing some names of typedefs (polygon --> Polygon_2 etc).
This commit is contained in:
Ester Ezra 2002-10-06 19:00:29 +00:00
parent 4931c708fd
commit bcebc261b1
2 changed files with 15 additions and 13 deletions

View File

@ -6,7 +6,7 @@
#include <CGAL/Bops/Polygons_bops_traits.h> #include <CGAL/Bops/Polygons_bops_traits.h>
#include <CGAL/Polygons_bops_2.h> #include <CGAL/Polygons_bops_2.h>
#include <iostream.h> #include <iostream>
#include <vector> #include <vector>
#include <list> #include <list>
@ -17,8 +17,8 @@
typedef CGAL::Quotient<int> NT; typedef CGAL::Quotient<int> NT;
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;
typedef K::Point_2 Point_2; typedef K::Point_2 Point_2;
typedef CGAL::Polygon_2<K> Polygon; typedef CGAL::Polygon_2<K> Polygon_2;
typedef Polygon::Segment_2 Segment_2; typedef Polygon_2::Segment_2 Segment_2;
typedef CGAL::Polygons_bops_traits_2<K> Bops_traits; typedef CGAL::Polygons_bops_traits_2<K> Bops_traits;
@ -26,7 +26,7 @@ using std::cin;
using std::cout; using std::cout;
using std::endl; using std::endl;
void read_polygon(Polygon& polygon) void read_polygon(Polygon_2& polygon)
{ {
unsigned int n; unsigned int n;
@ -41,7 +41,7 @@ void read_polygon(Polygon& polygon)
int main() int main()
{ {
Polygon poly1, poly2; Polygon_2 poly1, poly2;
read_polygon(poly1); read_polygon(poly1);
read_polygon(poly2); read_polygon(poly2);
@ -50,7 +50,7 @@ int main()
cout<<poly1<<endl; cout<<poly1<<endl;
cout<<poly2<<endl; cout<<poly2<<endl;
std::list<Polygon> polygons; std::list<Polygon_2> polygons;
std::list<Segment_2> curves; std::list<Segment_2> curves;
std::list<Point_2> points; std::list<Point_2> points;
@ -64,7 +64,7 @@ int main()
cout<<"The number of resulting polygons: "<< cout<<"The number of resulting polygons: "<<
polygons.size()<<endl; polygons.size()<<endl;
for (std::list<Polygon>::iterator iter = polygons.begin(); for (std::list<Polygon_2>::iterator iter = polygons.begin();
iter != polygons.end(); ++iter) iter != polygons.end(); ++iter)
cout << *iter << endl; cout << *iter << endl;

View File

@ -6,7 +6,7 @@
#include <CGAL/Bops/Polygons_bops_traits.h> #include <CGAL/Bops/Polygons_bops_traits.h>
#include <CGAL/Polygons_bops_2.h> #include <CGAL/Polygons_bops_2.h>
#include <iostream.h> #include <iostream>
#include <vector> #include <vector>
#include <list> #include <list>
@ -17,8 +17,8 @@
typedef CGAL::Quotient<int> NT; typedef CGAL::Quotient<int> NT;
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;
typedef K::Point_2 Point_2; typedef K::Point_2 Point_2;
typedef CGAL::Polygon_2<K> Polygon; typedef CGAL::Polygon_2<K> Polygon_2;
typedef Polygon::Segment_2 Segment_2; typedef Polygon_2::Segment_2 Segment_2;
typedef CGAL::Polygons_bops_traits_2<K> Bops_traits; typedef CGAL::Polygons_bops_traits_2<K> Bops_traits;
@ -26,7 +26,7 @@ using std::cin;
using std::cout; using std::cout;
using std::endl; using std::endl;
void read_polygon(Polygon& polygon) void read_polygon(Polygon_2& polygon)
{ {
unsigned int n; unsigned int n;
@ -41,7 +41,7 @@ void read_polygon(Polygon& polygon)
int main() int main()
{ {
Polygon poly1, poly2; Polygon_2 poly1, poly2;
read_polygon(poly1); read_polygon(poly1);
read_polygon(poly2); read_polygon(poly2);
@ -50,7 +50,7 @@ int main()
cout<<poly1<<endl; cout<<poly1<<endl;
cout<<poly2<<endl; cout<<poly2<<endl;
std::list<Polygon> polygons; std::list<Polygon_2> polygons;
std::list<Segment_2> curves; std::list<Segment_2> curves;
std::list<Point_2> points; std::list<Point_2> points;
@ -63,3 +63,5 @@ int main()
return 0; return 0;
} }