From 422cd589c1b5c5a8032f012cd658753e2185e6ad Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 3 Apr 2019 10:27:55 +0200 Subject: [PATCH] Add missing includes to get BOOST_VERSION and BOOST_GCC --- GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp | 3 ++- .../demo/Apollonius_graph_2/Apollonius_graph_2.cpp | 3 ++- .../demo/Bounding_volumes/Bounding_volumes.cpp | 2 ++ .../demo/Circular_kernel_2/Circular_kernel_2.cpp | 3 ++- .../L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp | 2 ++ .../Periodic_2_Delaunay_triangulation_2.cpp | 2 ++ GraphicsView/demo/Polygon/Polygon_2.cpp | 2 ++ .../Segment_Delaunay_graph_2/Segment_voronoi_2.cpp | 3 ++- .../Segment_voronoi_linf_2.cpp | 3 ++- .../demo/Snap_rounding_2/Snap_rounding_2.cpp | 2 ++ .../demo/Spatial_searching_2/Spatial_searching_2.cpp | 2 ++ GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp | 3 ++- .../Constrained_Delaunay_triangulation_2.cpp | 2 ++ .../Triangulation_2/Delaunay_triangulation_2.cpp | 2 ++ .../demo/Triangulation_2/Regular_triangulation_2.cpp | 2 ++ .../Polyline_simplification_2.cpp | 2 ++ .../points_and_vertices.cpp | 3 +++ .../examples/Polyline_simplification_2/simplify.cpp | 3 +++ .../Polyline_simplification_2/simplify_polygon.cpp | 12 +++++++++--- .../Polyline_simplification_2/simplify_polyline.cpp | 3 +++ .../examples/Stream_support/Linestring_WKT.cpp | 3 +++ Stream_support/examples/Stream_support/Point_WKT.cpp | 4 +++- .../examples/Stream_support/Polygon_WKT.cpp | 3 +++ Stream_support/examples/Stream_support/read_WKT.cpp | 3 +++ Stream_support/test/Stream_support/test_read_WKT.cpp | 3 +++ .../test/Stream_support/test_write_WKT.cpp | 3 +++ 26 files changed, 68 insertions(+), 10 deletions(-) diff --git a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp index bdac00894d3..25f35abeb05 100644 --- a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp +++ b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp @@ -1,5 +1,6 @@ #include - +#include +#include // CGAL headers #include #include diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp index 995940990c5..83b0072bf62 100644 --- a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp +++ b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp @@ -1,5 +1,6 @@ #include - +#include +#include // CGAL headers #include #include diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp index 896f7813fee..2b68def4b86 100644 --- a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp +++ b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp @@ -1,5 +1,7 @@ #include #include +#include +#include // CGAL headers #include diff --git a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp index 54781eb6b4d..43c43ec3d27 100644 --- a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp +++ b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp @@ -1,4 +1,5 @@ - +#include +#include #include // CGAL headers diff --git a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp index dd365b0b4a1..7fc23c1b53f 100644 --- a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp +++ b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp @@ -31,6 +31,8 @@ #include #include #include +#include +#include #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #endif diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp index 2e17b592890..70399080857 100644 --- a/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp @@ -1,5 +1,7 @@ #include +#include +#include // CGAL headers #include #include diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp index 598b7454631..80963432749 100644 --- a/GraphicsView/demo/Polygon/Polygon_2.cpp +++ b/GraphicsView/demo/Polygon/Polygon_2.cpp @@ -11,6 +11,8 @@ #include #include #include +#include +#include #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #endif diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp index b69a04c1270..754b10f14be 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp @@ -6,7 +6,8 @@ // CGAL headers #include "svd-typedefs.h" - +#include +#include #include // Qt headers diff --git a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp index 16b769fd626..cb0564ffba8 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp @@ -8,7 +8,8 @@ #include "svd-typedefs.h" #include - +#include +#include // Qt headers #include #include diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp index 2ec1e90f099..09ba1177200 100644 --- a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp +++ b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp @@ -1,5 +1,7 @@ #include +#include +#include // CGAL headers #include #include diff --git a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp index 28a0b0762e1..bbadc1fd3fe 100644 --- a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp +++ b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp @@ -1,4 +1,6 @@ #include +#include +#include // CGAL headers #include #include diff --git a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp index e4ab151cbc3..27c00e9cd8d 100644 --- a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp +++ b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp @@ -1,5 +1,6 @@ #include - +#include +#include // CGAL headers #include #include diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 1de92c7ca16..2c5631f879a 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include // CGAL headers #include diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp index 315da883051..17ea774125b 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp @@ -1,4 +1,6 @@ #include +#include +#include // CGAL headers #include diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp index 7194cb27669..79453bb37e3 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -1,4 +1,6 @@ #include +#include +#include // CGAL headers #include diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp b/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp index 4289720422b..aa1a5782758 100644 --- a/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp +++ b/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp @@ -3,6 +3,8 @@ #include #include #include +#include +#include // CGAL headers #include diff --git a/Polyline_simplification_2/examples/Polyline_simplification_2/points_and_vertices.cpp b/Polyline_simplification_2/examples/Polyline_simplification_2/points_and_vertices.cpp index 2f7fb8efa50..ac911c557ad 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/points_and_vertices.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/points_and_vertices.cpp @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include diff --git a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp index 45c63424499..245612cd804 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp @@ -1,3 +1,6 @@ +#include +#include + #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include diff --git a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp index 7bad1321a76..3a44df5669c 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp @@ -1,3 +1,5 @@ +#include +#include #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include @@ -14,10 +16,9 @@ typedef CGAL::Polygon_2 Polygon_2; typedef CGAL::Polygon_with_holes_2 Polygon_with_holes_2; typedef PS::Stop_below_count_ratio_threshold Stop; typedef PS::Squared_distance_cost Cost; -#endif + int main(int argc, char* argv[]) { - #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::ifstream ifs( (argc==1)?"data/polygon.wkt":argv[1]); Polygon_with_holes_2 polygon; CGAL::read_polygon_WKT(ifs, polygon); @@ -27,6 +28,11 @@ int main(int argc, char* argv[]) std::cout.precision(12); CGAL::write_polygon_WKT(std::cout, polygon) << std::endl; -#endif return 0; } +#else +int main() +{ + return 0; +} +#endif diff --git a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp index 79c28f1f8ba..17fdf1dfec4 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp @@ -1,3 +1,6 @@ +#include +#include + #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include diff --git a/Stream_support/examples/Stream_support/Linestring_WKT.cpp b/Stream_support/examples/Stream_support/Linestring_WKT.cpp index fa111bc386b..5c95562620a 100644 --- a/Stream_support/examples/Stream_support/Linestring_WKT.cpp +++ b/Stream_support/examples/Stream_support/Linestring_WKT.cpp @@ -1,3 +1,6 @@ +#include +#include + #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include diff --git a/Stream_support/examples/Stream_support/Point_WKT.cpp b/Stream_support/examples/Stream_support/Point_WKT.cpp index c135cae6905..e4650ba0e12 100644 --- a/Stream_support/examples/Stream_support/Point_WKT.cpp +++ b/Stream_support/examples/Stream_support/Point_WKT.cpp @@ -1,7 +1,9 @@ -#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include +#include +#include +#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include diff --git a/Stream_support/examples/Stream_support/Polygon_WKT.cpp b/Stream_support/examples/Stream_support/Polygon_WKT.cpp index 1fb706002be..83f30726248 100644 --- a/Stream_support/examples/Stream_support/Polygon_WKT.cpp +++ b/Stream_support/examples/Stream_support/Polygon_WKT.cpp @@ -1,3 +1,6 @@ +#include +#include + #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include diff --git a/Stream_support/examples/Stream_support/read_WKT.cpp b/Stream_support/examples/Stream_support/read_WKT.cpp index d1c571cc10b..82da2bbf99c 100644 --- a/Stream_support/examples/Stream_support/read_WKT.cpp +++ b/Stream_support/examples/Stream_support/read_WKT.cpp @@ -1,3 +1,6 @@ +#include +#include + #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include diff --git a/Stream_support/test/Stream_support/test_read_WKT.cpp b/Stream_support/test/Stream_support/test_read_WKT.cpp index 70e1bb329d0..0b550d76f34 100644 --- a/Stream_support/test/Stream_support/test_read_WKT.cpp +++ b/Stream_support/test/Stream_support/test_read_WKT.cpp @@ -1,5 +1,8 @@ #include #include +#include +#include + #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include diff --git a/Stream_support/test/Stream_support/test_write_WKT.cpp b/Stream_support/test/Stream_support/test_write_WKT.cpp index 02b340446c8..9586021beb9 100644 --- a/Stream_support/test/Stream_support/test_write_WKT.cpp +++ b/Stream_support/test/Stream_support/test_write_WKT.cpp @@ -1,3 +1,6 @@ +#include +#include + #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include