Skip to content

Commit c3a7749

Browse files
committed
Rename intersections.h to do_intersect.h
1 parent 5e73552 commit c3a7749

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

Convex_hull_3/examples/Convex_hull_3/do_intersect_ch3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <CGAL/Extreme_points_traits_adapter_3.h>
55
#include <CGAL/convex_hull_3.h>
66
#include <CGAL/Convex_hull_3/distance.h>
7-
#include <CGAL/Convex_hull_3/intersections.h>
7+
#include <CGAL/Convex_hull_3/do_intersect.h>
88
#include <CGAL/Convex_hull_hierarchy.h>
99

1010
#include <CGAL/boost/graph/IO/polygon_mesh_io.h>

Convex_hull_3/include/CGAL/Convex_hull_3/distance.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
2626

2727
#include <CGAL/Convex_hull_hierarchy.h>
28-
#include <CGAL/Convex_hull_3/intersections.h>
28+
#include <CGAL/Convex_hull_3/do_intersect.h>
2929
#include <CGAL/squared_distance_3.h>
3030

3131
#include <CGAL/IO/helpers.h>

Convex_hull_3/include/CGAL/Convex_hull_3/intersections.h renamed to Convex_hull_3/include/CGAL/Convex_hull_3/do_intersect.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// Author(s) : Samuel Hornus, Sébastien Loriot and Léo Valque
1212
//
1313

14-
#ifndef CGAL_CONVEX_HULL_3_INTERSECTIONS_H
15-
#define CGAL_CONVEX_HULL_3_INTERSECTIONS_H
14+
#ifndef CGAL_CONVEX_HULL_3_DO_INTERSECT_H
15+
#define CGAL_CONVEX_HULL_3_DO_INTERSECT_H
1616

1717
#include <CGAL/license/Convex_hull_3.h>
1818

@@ -705,4 +705,4 @@ bool do_intersect(const Convex1& c1, const Convex2& c2,
705705

706706
}} // CGAL::Convex_hull_3 namespace
707707

708-
#endif // CGAL_CONVEX_HULL_3_INTERSECTIONS_H
708+
#endif // CGAL_CONVEX_HULL_3_DO_INTERSECT_H

Convex_hull_3/test/Convex_hull_3/ch3_test_do_intersect.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
22
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
3-
#include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h>
43
#include <CGAL/Simple_cartesian.h>
54

65
#include <CGAL/Surface_mesh.h>
@@ -19,7 +18,6 @@
1918
#include <vector>
2019
#include <fstream>
2120

22-
// typedef CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt Epeck_with_sqrt;
2321
typedef CGAL::Exact_predicates_exact_constructions_kernel Epeck;
2422
typedef CGAL::Exact_predicates_inexact_constructions_kernel Epick;
2523
// typedef CGAL::Simple_cartesian<double> Cartesian;
@@ -305,10 +303,9 @@ int main(int argc, char** argv)
305303

306304
std::cout << std::setprecision(17);
307305

308-
// Test<C>().full_test(r); //Too hard
306+
// Test<Cartesian, CGAL::Surface_mesh<Cartesian::Point_3>>().full_test(r); //Too hard
309307
Test<Epick, CGAL::Surface_mesh<Epick::Point_3> >().full_test(r);
310308
Test<Epick, CGAL::Polyhedron_3<Epick> >().full_test(r);
311-
// Test<Epeck, CGAL::Surface_mesh<Epeck::Point_3> >().full_test(r);
312-
// Test<Epeck_with_sqrt>().test_implicit_function(r,10);
309+
Test<Epeck, CGAL::Surface_mesh<Epeck::Point_3> >().full_test(r);
313310
return 0;
314311
}

0 commit comments

Comments
 (0)