diff --git a/Packages/Intersections_2/changes.txt b/Packages/Intersections_2/changes.txt index cab72b9777a..c016420d900 100644 --- a/Packages/Intersections_2/changes.txt +++ b/Packages/Intersections_2/changes.txt @@ -1,3 +1,6 @@ +2.9.1 (3 October 2001) +Small fixes + 2.9 (19 September 2001) Bbox_2 intersections with line and ray use pimpl idiom and Simple_cartesian. diff --git a/Packages/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h b/Packages/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h index b000f0e1bdb..9dabd16e432 100644 --- a/Packages/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h +++ b/Packages/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h @@ -62,7 +62,7 @@ Bbox_2_Line_2_pair intersection_computer_line_2( } inline bool do_intersect_line_2( - const Bbox_2 &box, double line_a, double line_b, double line_c); + const Bbox_2 &box, double line_a, double line_b, double line_c) { Bbox_2_Line_2_pair pair(box, line_a, line_b, line_c); return pair.intersection_type() != Bbox_2_Line_2_pair::NO; diff --git a/Packages/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h b/Packages/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h index e880f0a7743..0d86cfc0c9f 100644 --- a/Packages/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h +++ b/Packages/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h @@ -173,7 +173,7 @@ Line_2_Line_2_pair::Line_2_Line_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Line_2_Line_2_pair::Intersection_results +typename Line_2_Line_2_pair::Intersection_results Line_2_Line_2_pair::intersection_type() const { typedef typename R::RT RT; diff --git a/Packages/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h b/Packages/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h index 2c588d8c342..937e6273f87 100644 --- a/Packages/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h +++ b/Packages/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h @@ -169,7 +169,7 @@ Ray_2_Line_2_pair::Ray_2_Line_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Ray_2_Line_2_pair::Intersection_results +typename Ray_2_Line_2_pair::Intersection_results Ray_2_Line_2_pair::intersection_type() const { if (_known) diff --git a/Packages/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h b/Packages/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h index 040dd5950a6..eb8f17c5847 100644 --- a/Packages/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h +++ b/Packages/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h @@ -217,7 +217,7 @@ Ray_2_Ray_2_pair::Ray_2_Ray_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Ray_2_Ray_2_pair::Intersection_results +typename Ray_2_Ray_2_pair::Intersection_results Ray_2_Ray_2_pair::intersection_type() const { if (_known) diff --git a/Packages/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h b/Packages/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h index eb4afedcaf0..5030e556b24 100644 --- a/Packages/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h +++ b/Packages/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h @@ -226,7 +226,7 @@ Ray_2_Segment_2_pair::Ray_2_Segment_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Ray_2_Segment_2_pair::Intersection_results +typename Ray_2_Segment_2_pair::Intersection_results Ray_2_Segment_2_pair::intersection_type() const { if (_known) diff --git a/Packages/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h b/Packages/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h index 13e3996c6ff..093c3f8634c 100644 --- a/Packages/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h +++ b/Packages/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h @@ -168,7 +168,7 @@ Segment_2_Line_2_pair::Segment_2_Line_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Segment_2_Line_2_pair::Intersection_results +typename Segment_2_Line_2_pair::Intersection_results Segment_2_Line_2_pair::intersection_type() const { if (_known) diff --git a/Packages/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h b/Packages/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h index 55932cf626b..25b2e4af478 100644 --- a/Packages/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h +++ b/Packages/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h @@ -424,7 +424,7 @@ Segment_2_Segment_2_pair::Segment_2_Segment_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Segment_2_Segment_2_pair::Intersection_results +typename Segment_2_Segment_2_pair::Intersection_results Segment_2_Segment_2_pair::intersection_type() const { if (_known) diff --git a/Packages/Intersections_2/version b/Packages/Intersections_2/version index adb40d62848..318cd6ff91c 100644 --- a/Packages/Intersections_2/version +++ b/Packages/Intersections_2/version @@ -1 +1 @@ -2.10 (28 Sep 2001) +2.9.1 ( 3 Oct 2001) diff --git a/Packages/Intersections_2/web/intersection_2_1.fw b/Packages/Intersections_2/web/intersection_2_1.fw index be401cf7292..a2957df0d1a 100644 --- a/Packages/Intersections_2/web/intersection_2_1.fw +++ b/Packages/Intersections_2/web/intersection_2_1.fw @@ -59,7 +59,7 @@ Bbox_2_Line_2_pair intersection_computer_line_2( } inline bool do_intersect_line_2( - const Bbox_2 &box, double line_a, double line_b, double line_c); + const Bbox_2 &box, double line_a, double line_b, double line_c) { Bbox_2_Line_2_pair pair(box, line_a, line_b, line_c); return pair.intersection_type() != Bbox_2_Line_2_pair::NO; @@ -711,7 +711,7 @@ Line_2_Line_2_pair::Line_2_Line_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Line_2_Line_2_pair::Intersection_results +typename Line_2_Line_2_pair::Intersection_results Line_2_Line_2_pair::intersection_type() const @ #endif // CGAL_CFG_RETURN_TYPE_BUG_2 @@ -914,7 +914,7 @@ Segment_2_Line_2_pair::Segment_2_Line_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Segment_2_Line_2_pair::Intersection_results +typename Segment_2_Line_2_pair::Intersection_results Segment_2_Line_2_pair::intersection_type() const @ #endif // CGAL_CFG_RETURN_TYPE_BUG_2 @@ -1242,7 +1242,7 @@ Segment_2_Segment_2_pair::Segment_2_Segment_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Segment_2_Segment_2_pair::Intersection_results +typename Segment_2_Segment_2_pair::Intersection_results Segment_2_Segment_2_pair::intersection_type() const @ #endif // CGAL_CFG_RETURN_TYPE_BUG_2 @@ -1500,7 +1500,7 @@ Ray_2_Line_2_pair::Ray_2_Line_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Ray_2_Line_2_pair::Intersection_results +typename Ray_2_Line_2_pair::Intersection_results Ray_2_Line_2_pair::intersection_type() const @ #endif // CGAL_CFG_RETURN_TYPE_BUG_2 @@ -1694,7 +1694,7 @@ Ray_2_Segment_2_pair::Ray_2_Segment_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Ray_2_Segment_2_pair::Intersection_results +typename Ray_2_Segment_2_pair::Intersection_results Ray_2_Segment_2_pair::intersection_type() const @ #endif // CGAL_CFG_RETURN_TYPE_BUG_2 @@ -1950,7 +1950,7 @@ Ray_2_Ray_2_pair::Ray_2_Ray_2_pair( #ifndef CGAL_CFG_RETURN_TYPE_BUG_2 template -Ray_2_Ray_2_pair::Intersection_results +typename Ray_2_Ray_2_pair::Intersection_results Ray_2_Ray_2_pair::intersection_type() const @ #endif // CGAL_CFG_RETURN_TYPE_BUG_2