From 743569f8546163f702f5b3addbfd4e7d5c08dedb Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 9 Jan 2019 16:32:08 +0100 Subject: [PATCH] Also disable WKT if gcc version is <4.5 --- GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp | 6 +++--- .../demo/Apollonius_graph_2/Apollonius_graph_2.cpp | 10 +++++----- .../demo/Bounding_volumes/Bounding_volumes.cpp | 10 +++++----- .../demo/Circular_kernel_2/Circular_kernel_2.cpp | 6 +++--- .../demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp | 10 +++++----- .../Periodic_2_Delaunay_triangulation_2.cpp | 10 +++++----- GraphicsView/demo/Polygon/Polygon_2.cpp | 10 +++++----- .../Segment_Delaunay_graph_2/Segment_voronoi_2.cpp | 10 +++++----- .../Segment_voronoi_linf_2.cpp | 10 +++++----- GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp | 10 +++++----- .../demo/Spatial_searching_2/Spatial_searching_2.cpp | 6 +++--- GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp | 10 +++++----- .../Constrained_Delaunay_triangulation_2.cpp | 10 +++++----- .../demo/Triangulation_2/Delaunay_triangulation_2.cpp | 10 +++++----- .../demo/Triangulation_2/Regular_triangulation_2.cpp | 10 +++++----- .../Polyline_simplification_2.cpp | 10 +++++----- .../Polyline_simplification_2/points_and_vertices.cpp | 4 ++-- .../examples/Polyline_simplification_2/simplify.cpp | 2 +- .../Polyline_simplification_2/simplify_polygon.cpp | 4 ++-- .../Polyline_simplification_2/simplify_polyline.cpp | 4 ++-- .../examples/Stream_support/Linestring_WKT.cpp | 2 +- Stream_support/examples/Stream_support/Point_WKT.cpp | 2 +- Stream_support/examples/Stream_support/Polygon_WKT.cpp | 2 +- Stream_support/examples/Stream_support/read_WKT.cpp | 2 +- Stream_support/include/CGAL/IO/WKT.h | 2 +- Stream_support/include/CGAL/IO/traits_linestring.h | 2 +- .../include/CGAL/IO/traits_multilinestring.h | 2 +- Stream_support/include/CGAL/IO/traits_multipoint.h | 2 +- Stream_support/include/CGAL/IO/traits_multipolygon.h | 2 +- Stream_support/include/CGAL/IO/traits_point.h | 2 +- Stream_support/include/CGAL/IO/traits_point_3.h | 2 +- Stream_support/include/CGAL/IO/traits_polygon.h | 2 +- .../include/CGAL/internal/Geometry_container.h | 2 +- Stream_support/test/Stream_support/test_read_WKT.cpp | 2 +- Stream_support/test/Stream_support/test_write_WKT.cpp | 2 +- 35 files changed, 96 insertions(+), 96 deletions(-) diff --git a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp index 61c269f3416..2a7a1acacb8 100644 --- a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp +++ b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp @@ -6,7 +6,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif #include @@ -252,7 +252,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wktk *.WKT);;" #endif "All files (*)")); @@ -273,7 +273,7 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::read_multi_point_WKT(ifs, points); #endif } diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp index 48bb8a7199d..7acb93792cc 100644 --- a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp +++ b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp @@ -6,7 +6,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -219,7 +219,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.wpts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); @@ -240,7 +240,7 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector point_3_s; CGAL::read_multi_point_WKT(ifs, point_3_s); BOOST_FOREACH(const K::Point_3& point_3, point_3_s) @@ -269,7 +269,7 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".reg.cgal", tr("Weighted Points (*.wpts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files(*.wkt *.WKT);;" #endif "All (*)")); @@ -277,7 +277,7 @@ MainWindow::on_actionSavePoints_triggered() std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector points; for(Apollonius::Sites_iterator vit = ag.sites_begin(), diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp index c026d6ddd08..f73b28459f3 100644 --- a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp +++ b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp @@ -13,7 +13,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -477,7 +477,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.WKT *.wkt);;" #endif "All files (*)")); @@ -495,7 +495,7 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::read_multi_point_WKT(ifs, points); BOOST_FOREACH(K::Point_2 p, points) { @@ -530,7 +530,7 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.WKT *.wkt);;" #endif "All files (*)")); @@ -538,7 +538,7 @@ MainWindow::on_actionSavePoints_triggered() std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector out_pts; out_pts.reserve(std::distance(mc.points_begin(), mc.points_end())); diff --git a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp index 1892ff4e48d..bb92e978173 100644 --- a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp +++ b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp @@ -9,7 +9,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -215,7 +215,7 @@ MainWindow::on_actionLoadLineAndCircularArcs_triggered() tr("Open Line and Circular Arc File"), ".", tr("Edge files (*.arc)\n" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT)\n" #endif )); @@ -235,7 +235,7 @@ MainWindow::open(QString fileName) double x,y; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 //read pairs as Line_arc_2 and triplets as circular_arc_2 do { 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 cb44771ae04..6a37c534c21 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,7 +31,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -282,7 +282,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); @@ -302,7 +302,7 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::read_multi_point_WKT(ifs, m_sites); #endif } @@ -329,14 +329,14 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); if(! fileName.isEmpty()) { std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::write_multi_point_WKT(ofs, m_sites); #endif }else 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 c2f8ad8530e..7e0717dd5b9 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 @@ -6,7 +6,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -353,7 +353,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); @@ -374,7 +374,7 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::read_multi_point_WKT(ifs, points); #endif } @@ -402,7 +402,7 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); @@ -410,7 +410,7 @@ MainWindow::on_actionSavePoints_triggered() std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector points; points.reserve(std::distance(triang.unique_vertices_begin(), triang.unique_vertices_end())); diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp index 8bb9973cf91..236e25048bb 100644 --- a/GraphicsView/demo/Polygon/Polygon_2.cpp +++ b/GraphicsView/demo/Polygon/Polygon_2.cpp @@ -11,7 +11,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -232,7 +232,7 @@ MainWindow::on_actionLoadPolygon_triggered() ".", tr( "Polyline files (*.polygons.cgal);;" "WSL files (*.wsl);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All file (*)")); @@ -249,7 +249,7 @@ MainWindow::open(QString fileName) poly.clear(); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::Polygon_with_holes_2 P; CGAL::read_polygon_WKT(ifs, P); poly = Polygon2(P.outer_boundary().begin(), @@ -274,7 +274,7 @@ MainWindow::on_actionSavePolygon_triggered() tr("Save Polygon"), ".", tr( "Polyline files (*.polygons.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All file (*)")); @@ -282,7 +282,7 @@ MainWindow::on_actionSavePolygon_triggered() std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::Polygon_2 P(poly.begin(), poly.end()); CGAL::Polygon_with_holes_2 Pwh(P); 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 5705d657661..cb9c474531a 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp @@ -24,7 +24,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif //#include @@ -247,7 +247,7 @@ MainWindow::open(QString fileName) loadEdgConstraints(fileName); this->addToRecentFiles(fileName); } else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 loadWKTConstraints(fileName); this->addToRecentFiles(fileName); #endif @@ -263,7 +263,7 @@ MainWindow::on_actionLoadSegments_triggered() ".", tr("Edge files (*.edg);;" "Polyline files (*.polygons.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT)" #endif )); @@ -341,12 +341,12 @@ MainWindow::loadEdgConstraints(QString fileName) void MainWindow::loadWKTConstraints(QString - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 fileName #endif ) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 typedef CGAL::Polygon_with_holes_2 Polygon; typedef std::vector LineString; 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 275ccba5faf..06e9b28d8b7 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 @@ -22,7 +22,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif //#include @@ -271,7 +271,7 @@ MainWindow::open(QString fileName) loadSitesInput(fileName); this->addToRecentFiles(fileName); } else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 loadWKT(fileName); this->addToRecentFiles(fileName); #endif @@ -292,7 +292,7 @@ MainWindow::on_actionLoadSegments_triggered() "Pts files (*.pts);;" "Edge files (*.edg);;" "Polylines files (*.polygons.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.WKT *.wkt)" #endif )); @@ -390,12 +390,12 @@ MainWindow::loadPoints(QString fileName) void MainWindow::loadWKT(QString - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 fileName #endif ) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::ifstream ifs(qPrintable(fileName)); //Points do diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp index 93802ff9153..2ad3d6e22e6 100644 --- a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp +++ b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp @@ -18,7 +18,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -250,7 +250,7 @@ MainWindow::on_actionLoadSegments_triggered() tr("Open segment file"), ".", tr("Edge files (*.edg);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); @@ -268,7 +268,7 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector > mls; CGAL::read_multi_linestring_WKT(ifs, mls); BOOST_FOREACH(const std::vector& ls, mls) @@ -302,7 +302,7 @@ MainWindow::on_actionSaveSegments_triggered() tr("Save points"), ".", tr("Edge files (*.edg);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); @@ -311,7 +311,7 @@ MainWindow::on_actionSaveSegments_triggered() ofs.precision(12); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector >mls; BOOST_FOREACH(const Segment_2& seg, input) { diff --git a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp index 6b3c298c1f6..eb3969b0480 100644 --- a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp +++ b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp @@ -15,7 +15,7 @@ // GraphicsView items and event filters (input classes) #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -247,7 +247,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All files (*)")); @@ -269,7 +269,7 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::read_multi_point_WKT(ifs, points); #endif } diff --git a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp index bf4a0f3944a..897d7a4beb6 100644 --- a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp +++ b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp @@ -20,7 +20,7 @@ // for viewportsBbox #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif // the two base classes @@ -166,12 +166,12 @@ MainWindow::generate() void MainWindow::on_actionLoadPoints_triggered() { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #endif QString fileName = QFileDialog::getOpenFileName(this, tr("Open grid file"), "." - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 ,tr("WKT files (*.wkt *.WKT)") #endif ); @@ -193,7 +193,7 @@ MainWindow::open(QString fileName) iXSize = iYSize = 512; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector > mp; int size= -1; do @@ -247,7 +247,7 @@ MainWindow::open(QString fileName) void MainWindow::on_actionSavePoints_triggered() { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 QString fileName = QFileDialog::getSaveFileName(this, tr("Save points"), ".", diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 714373b7474..c0a4420ed4f 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -22,7 +22,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -525,7 +525,7 @@ MainWindow::open(QString fileName) } else if(fileName.endsWith(".poly")){ loadPolyConstraints(fileName); } else if(fileName.endsWith(".wkt")){ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 loadWKT(fileName); #endif } @@ -545,7 +545,7 @@ MainWindow::on_actionLoadConstraints_triggered() "Polyline files (*.polygons.cgal);;" "Poly files (*.poly);;" "CGAL files (*.cpts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.WKT *.wkt);;" #endif "All (*)")); @@ -554,12 +554,12 @@ MainWindow::on_actionLoadConstraints_triggered() void MainWindow::loadWKT(QString - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 filename #endif ) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 //Polygons todo : make it multipolygons std::ifstream ifs(qPrintable(filename)); do diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp index aacb269aeb4..f7870dec383 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp @@ -21,7 +21,7 @@ #include "TriangulationPointInputAndConflictZone.h" #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -320,7 +320,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.WKT *.wkt);;" #endif "All files (*)")); @@ -341,7 +341,7 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 CGAL::read_multi_point_WKT(ifs, points); #endif } @@ -368,7 +368,7 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.WKT *.wkt);;" #endif "All files (*)")); @@ -376,7 +376,7 @@ MainWindow::on_actionSavePoints_triggered() std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector points; points.reserve(dt.number_of_vertices()); for(Delaunay::Finite_vertices_iterator diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp index 939670cb111..3455fc40f94 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -3,7 +3,7 @@ // CGAL headers #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -245,7 +245,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("Weighted Points (*.wpts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All (*)")); @@ -255,7 +255,7 @@ MainWindow::on_actionLoadPoints_triggered() std::vector points; if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector points_3; CGAL::read_multi_point_WKT(ifs, points_3); BOOST_FOREACH(const K::Point_3& p, points_3) @@ -286,7 +286,7 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".reg.cgal", tr("Weighted Points (*.wpts.cgal);;" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 "WKT files (*.wkt *.WKT);;" #endif "All (*)")); @@ -294,7 +294,7 @@ MainWindow::on_actionSavePoints_triggered() std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::vector points_3; for(Regular::Finite_vertices_iterator vit = dt.finite_vertices_begin(), 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 c93de7c99f6..03cbf8d96a5 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 @@ -9,7 +9,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -343,7 +343,7 @@ MainWindow::open(QString fileName) this->addToRecentFiles(fileName); } else if(fileName.endsWith(".wkt")){ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 loadWKT(fileName); this->addToRecentFiles(fileName); #endif @@ -357,7 +357,7 @@ MainWindow::on_actionLoadConstraints_triggered() QString fileName = QFileDialog::getOpenFileName(this, tr("Open Constraint File"), "../data" - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 ,tr("Polylines (*.osm *.wkt);;") #endif ); @@ -377,12 +377,12 @@ std::string trim_right ( std::string str ) } void MainWindow::loadWKT(QString - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 fileName #endif ) { -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 typedef std::vector MultiPoint; typedef std::vector LineString; 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 56eec8dd263..a691a552c1e 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 @@ -6,7 +6,7 @@ #include #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #endif @@ -53,7 +53,7 @@ void print(const CT& ct, Constraint_id cid) int main(int argc, char* argv[]) { std::ifstream ifs( (argc==1)?"data/polygon.wkt":argv[1]); -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 const bool remove_points = false; CT ct; Polygon_with_holes_2 P; diff --git a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp index b8ffb620fe1..25666c59092 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #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 3907cfd4617..f8bd3ae6ce6 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include @@ -17,7 +17,7 @@ typedef PS::Squared_distance_cost Cost; #endif int main(int argc, char* argv[]) { - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 std::ifstream ifs( (argc==1)?"data/polygon.wkt":argv[1]); Polygon_with_holes_2 polygon; CGAL::read_polygon_WKT(ifs, polygon); 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 a3ab61ffe25..21e60432a53 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include @@ -17,7 +17,7 @@ typedef PS::Squared_distance_cost Cost; #endif int main(int argc, char* argv[]) { - #if BOOST_VERSION >= 105600 + #if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 Polyline_2 polyline; std::ifstream ifs( (argc==1)?"data/polyline.wkt":argv[1]); CGAL::read_linestring_WKT(ifs, polyline); diff --git a/Stream_support/examples/Stream_support/Linestring_WKT.cpp b/Stream_support/examples/Stream_support/Linestring_WKT.cpp index 814b566c845..83d361b2015 100644 --- a/Stream_support/examples/Stream_support/Linestring_WKT.cpp +++ b/Stream_support/examples/Stream_support/Linestring_WKT.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || 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 4d62d4c8285..044ff73556c 100644 --- a/Stream_support/examples/Stream_support/Point_WKT.cpp +++ b/Stream_support/examples/Stream_support/Point_WKT.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || 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 5f800ec36cb..f6b86cde53e 100644 --- a/Stream_support/examples/Stream_support/Polygon_WKT.cpp +++ b/Stream_support/examples/Stream_support/Polygon_WKT.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || 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 9214b4eb041..4f444f9d91b 100644 --- a/Stream_support/examples/Stream_support/read_WKT.cpp +++ b/Stream_support/examples/Stream_support/read_WKT.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include diff --git a/Stream_support/include/CGAL/IO/WKT.h b/Stream_support/include/CGAL/IO/WKT.h index ab2d8656f3e..7a6a0dc87e2 100644 --- a/Stream_support/include/CGAL/IO/WKT.h +++ b/Stream_support/include/CGAL/IO/WKT.h @@ -25,7 +25,7 @@ #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include diff --git a/Stream_support/include/CGAL/IO/traits_linestring.h b/Stream_support/include/CGAL/IO/traits_linestring.h index f6da2fa019c..7fc70852adc 100644 --- a/Stream_support/include/CGAL/IO/traits_linestring.h +++ b/Stream_support/include/CGAL/IO/traits_linestring.h @@ -17,7 +17,7 @@ // SPDX-License-Identifier: LGPL-3.0+ // // Author(s) : Maxime Gimeno -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #ifndef CGAL_IO_TRAITS_LINESTRING_H #define CGAL_IO_TRAITS_LINESTRING_H diff --git a/Stream_support/include/CGAL/IO/traits_multilinestring.h b/Stream_support/include/CGAL/IO/traits_multilinestring.h index eee50270878..f2048aa9c39 100644 --- a/Stream_support/include/CGAL/IO/traits_multilinestring.h +++ b/Stream_support/include/CGAL/IO/traits_multilinestring.h @@ -20,7 +20,7 @@ #ifndef CGAL_IO_TRAITS_MULTILINESTRING_H #define CGAL_IO_TRAITS_MULTILINESTRING_H -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include diff --git a/Stream_support/include/CGAL/IO/traits_multipoint.h b/Stream_support/include/CGAL/IO/traits_multipoint.h index c8d92470908..434593f8c17 100644 --- a/Stream_support/include/CGAL/IO/traits_multipoint.h +++ b/Stream_support/include/CGAL/IO/traits_multipoint.h @@ -20,7 +20,7 @@ #ifndef CGAL_IO_TRAITS_MULTIPOINT_H #define CGAL_IO_TRAITS_MULTIPOINT_H -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include diff --git a/Stream_support/include/CGAL/IO/traits_multipolygon.h b/Stream_support/include/CGAL/IO/traits_multipolygon.h index fd3b7259fb9..3d8a96abd3d 100644 --- a/Stream_support/include/CGAL/IO/traits_multipolygon.h +++ b/Stream_support/include/CGAL/IO/traits_multipolygon.h @@ -20,7 +20,7 @@ #ifndef CGAL_IO_TRAITS_MULTIPOLYGON_H #define CGAL_IO_TRAITS_MULTIPOLYGON_H -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include diff --git a/Stream_support/include/CGAL/IO/traits_point.h b/Stream_support/include/CGAL/IO/traits_point.h index a5026cad1f3..8c7968d9d3a 100644 --- a/Stream_support/include/CGAL/IO/traits_point.h +++ b/Stream_support/include/CGAL/IO/traits_point.h @@ -20,7 +20,7 @@ #ifndef CGAL_IO_TRAITS_POINT_H #define CGAL_IO_TRAITS_POINT_H -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include diff --git a/Stream_support/include/CGAL/IO/traits_point_3.h b/Stream_support/include/CGAL/IO/traits_point_3.h index dc7cd863032..701b06c3855 100644 --- a/Stream_support/include/CGAL/IO/traits_point_3.h +++ b/Stream_support/include/CGAL/IO/traits_point_3.h @@ -20,7 +20,7 @@ #ifndef CGAL_IO_TRAITS_POINT_3_H #define CGAL_IO_TRAITS_POINT_3_H -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include diff --git a/Stream_support/include/CGAL/IO/traits_polygon.h b/Stream_support/include/CGAL/IO/traits_polygon.h index be71ff5ab3f..2af5f7f9ce6 100644 --- a/Stream_support/include/CGAL/IO/traits_polygon.h +++ b/Stream_support/include/CGAL/IO/traits_polygon.h @@ -20,7 +20,7 @@ #ifndef CGAL_IO_TRAITS_POLYGON_H #define CGAL_IO_TRAITS_POLYGON_H -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include #include diff --git a/Stream_support/include/CGAL/internal/Geometry_container.h b/Stream_support/include/CGAL/internal/Geometry_container.h index 957f83cae7b..777bc8316db 100644 --- a/Stream_support/include/CGAL/internal/Geometry_container.h +++ b/Stream_support/include/CGAL/internal/Geometry_container.h @@ -20,7 +20,7 @@ #ifndef GEOMETRY_CONTAINER_H #define GEOMETRY_CONTAINER_H -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #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 7b1a734058f..81c179922a7 100644 --- a/Stream_support/test/Stream_support/test_read_WKT.cpp +++ b/Stream_support/test/Stream_support/test_read_WKT.cpp @@ -1,6 +1,6 @@ #include #include -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include diff --git a/Stream_support/test/Stream_support/test_write_WKT.cpp b/Stream_support/test/Stream_support/test_write_WKT.cpp index f23cb88e15b..60f7b81e59a 100644 --- a/Stream_support/test/Stream_support/test_write_WKT.cpp +++ b/Stream_support/test/Stream_support/test_write_WKT.cpp @@ -1,4 +1,4 @@ -#if BOOST_VERSION >= 105600 +#if BOOST_VERSION >= 105600 || BOOST_GCC < 40500 #include #include