From e6c767d5c9869ab050102efe0dd4629ece65a447 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 12 May 2021 15:45:07 +0200 Subject: [PATCH] Simplify the GNUC versions tests --- Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h | 10 +--------- .../CGAL/Arr_point_location/Td_X_trapezoid.h | 5 ----- .../CGAL/Arr_point_location/Td_active_edge.h | 6 ------ .../Td_active_fictitious_vertex.h | 6 ------ .../CGAL/Arr_point_location/Td_active_trapezoid.h | 6 ------ .../CGAL/Arr_point_location/Td_active_vertex.h | 6 ------ .../CGAL/Arr_point_location/Td_inactive_edge.h | 6 ------ .../Td_inactive_fictitious_vertex.h | 6 ------ .../CGAL/Arr_point_location/Td_inactive_vertex.h | 6 ------ .../Trapezoidal_decomposition_2_misc.h | 2 -- BGL/include/CGAL/boost/parameter.h | 2 +- .../benchmark/parser/benchmark_parser.cpp | 2 +- Combinatorial_map/include/CGAL/Combinatorial_map.h | 4 ++-- .../include/CGAL/Combinatorial_map_storages.h | 4 ++-- Generalized_map/include/CGAL/Generalized_map.h | 4 ++-- .../include/CGAL/Generalized_map_storages.h | 4 ++-- .../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 ------ .../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 | 11 +---------- .../Segment_voronoi_linf_2.cpp | 14 +------------- .../demo/Snap_rounding_2/Snap_rounding_2.cpp | 10 ---------- .../Spatial_searching_2/Spatial_searching_2.cpp | 6 ------ .../demo/Stream_lines_2/Stream_lines_2.cpp | 13 ------------- .../Constrained_Delaunay_triangulation_2.cpp | 14 +------------- .../Triangulation_2/Delaunay_triangulation_2.cpp | 10 ---------- .../Triangulation_2/Regular_triangulation_2.cpp | 10 ---------- Installation/CMakeLists.txt | 5 ----- .../config/support/CGAL_test_cpp_version.cpp | 2 +- Installation/include/CGAL/config.h | 10 +++++----- Installation/include/CGAL/export/helpers.h | 2 +- .../CGAL/CMap_linear_cell_complex_storages.h | 4 ++-- .../CGAL/GMap_linear_cell_complex_storages.h | 4 ++-- NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h | 2 +- NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h | 2 +- NewKernel_d/test/NewKernel_d/Epick_d.cpp | 11 ----------- Number_types/include/CGAL/FPU.h | 5 ++--- .../CGAL/Partition_2/partition_approx_convex_2.h | 4 ++-- ...cls_periodic_3_regular_triangulation_traits_3.h | 2 +- .../_test_cls_periodic_3_triangulation_traits_3.h | 2 +- .../Polyline_simplification_2.cpp | 14 +------------- .../points_and_vertices.cpp | 6 ------ .../Polyline_simplification_2/simplify.cpp | 8 -------- .../Polyline_simplification_2/simplify_polygon.cpp | 7 ------- .../simplify_polyline.cpp | 5 ----- .../examples/Stream_support/Linestring_WKT.cpp | 8 -------- .../examples/Stream_support/Point_WKT.cpp | 8 -------- .../examples/Stream_support/Polygon_WKT.cpp | 8 -------- .../examples/Stream_support/read_WKT.cpp | 10 ---------- Stream_support/include/CGAL/IO/WKT.h | 4 ---- .../include/CGAL/IO/WKT/traits_linestring.h | 3 --- .../include/CGAL/IO/WKT/traits_multilinestring.h | 3 --- .../include/CGAL/IO/WKT/traits_multipoint.h | 4 ---- .../include/CGAL/IO/WKT/traits_multipolygon.h | 3 --- Stream_support/include/CGAL/IO/WKT/traits_point.h | 3 --- .../include/CGAL/IO/WKT/traits_point_3.h | 3 --- .../include/CGAL/IO/WKT/traits_polygon.h | 3 --- .../include/CGAL/internal/Geometry_container.h | 2 -- Stream_support/test/Stream_support/test_WKT.cpp | 8 +------- .../Triangulation/delaunay_triangulation.cpp | 11 ----------- .../examples/Triangulation/triangulation.cpp | 9 --------- Triangulation/test/Triangulation/test_delaunay.cpp | 11 ----------- Triangulation/test/Triangulation/test_torture.cpp | 10 ---------- .../test/Triangulation/test_triangulation.cpp | 10 ---------- 68 files changed, 35 insertions(+), 410 deletions(-) diff --git a/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h b/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h index bbd6c7b089b..490d320d11d 100644 --- a/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h +++ b/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h @@ -44,20 +44,12 @@ public: using Base::f; protected: -#if defined(__POWERPC__) && \ - defined(__GNUC__) && (__GNUC__ == 3 ) && (__GNUC_MINOR__ == 4) - // hack to avoid nasty warning for G++ 3.4 on Darwin - static FT OFFSET() - { - return FT(10000); - } -#else + static const FT& OFFSET() { static const FT offset_(10000); return offset_; } -#endif template< class Stream > inline diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h index e7202ffe935..98f95bac53f 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h @@ -124,13 +124,8 @@ public: friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::Around_point_circulator; - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::Around_point_circulator; friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif #else friend class Around_point_circulator; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h index 61259f33547..572d3aa9505 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h @@ -95,13 +95,7 @@ public: #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) - -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif - #else friend class In_face_iterator; #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h index b75de1b9d97..7905bf6a21e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h @@ -95,13 +95,7 @@ public: #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) - -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif - #else friend class In_face_iterator; #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_trapezoid.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_trapezoid.h index 8b92b739626..d7d55a86846 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_trapezoid.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_trapezoid.h @@ -92,13 +92,7 @@ public: #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) - -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif - #else friend class In_face_iterator; #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h index 3b3e86aa0c6..77ff7b59286 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h @@ -97,13 +97,7 @@ public: #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) - -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif - #else friend class In_face_iterator; #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h index bb57f7c6d1c..1dbda6937db 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h @@ -94,13 +94,7 @@ public: #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) - -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif - #else friend class In_face_iterator; #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h index 03ca8d563c7..c61205c26cd 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h @@ -97,13 +97,7 @@ public: #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) - -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif - #else friend class In_face_iterator; #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h index 409a6f576ee..6a7e6c0eb05 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h @@ -93,13 +93,7 @@ public: #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) friend class Trapezoidal_decomposition_2::In_face_iterator; #elif defined(__GNUC__) - -#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2))) - friend typename Trapezoidal_decomposition_2::In_face_iterator; -#else friend class Trapezoidal_decomposition_2::In_face_iterator; -#endif - #else friend class In_face_iterator; #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h index a6eca6682ed..4f939643501 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h @@ -46,9 +46,7 @@ #define CGAL_TD_DEFAULT_SIZE_THRESHOLD 12 #ifndef _MSC_VER -#if !defined __GNUC__ || __GNUC__> 3 || ((__GNUC__== 3) && (__GNUC_MINOR__> 4)) #define CGAL_PM_FRIEND_CLASS #endif -#endif #endif diff --git a/BGL/include/CGAL/boost/parameter.h b/BGL/include/CGAL/boost/parameter.h index d4f213919d2..9c28ac96b7a 100644 --- a/BGL/include/CGAL/boost/parameter.h +++ b/BGL/include/CGAL/boost/parameter.h @@ -25,7 +25,7 @@ #include -#if defined(__clang__) || (BOOST_GCC >= 40600) +#if defined(__clang__) || defined(BOOST_GCC) # define CGAL_IGNORE_UNUSED_VARIABLES \ _Pragma("GCC diagnostic ignored \"-Wunused-variable\"") \ _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") diff --git a/Circular_kernel_2/benchmark/parser/benchmark_parser.cpp b/Circular_kernel_2/benchmark/parser/benchmark_parser.cpp index 1c8177b2793..daab78244d1 100644 --- a/Circular_kernel_2/benchmark/parser/benchmark_parser.cpp +++ b/Circular_kernel_2/benchmark/parser/benchmark_parser.cpp @@ -232,7 +232,7 @@ union yyalloc /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if defined (__GNUC__) && 1 < __GNUC__ +# if defined (__GNUC__) # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 580444e9812..0d151b33edd 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -55,7 +55,7 @@ #endif #include -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"") #endif @@ -4824,7 +4824,7 @@ namespace CGAL { } // namespace CGAL -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic pop") #endif diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h index 08eabb22f24..949eb1ebc36 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h @@ -19,7 +19,7 @@ #include #include -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"") #endif @@ -439,7 +439,7 @@ namespace CGAL { } // namespace CGAL -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic pop") #endif diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h index 3c79b6d2c37..eb616218dac 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -42,7 +42,7 @@ #endif #include -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"") #endif @@ -3890,7 +3890,7 @@ namespace CGAL { } // namespace CGAL -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic pop") #endif diff --git a/Generalized_map/include/CGAL/Generalized_map_storages.h b/Generalized_map/include/CGAL/Generalized_map_storages.h index 56040f48759..837717fe68f 100644 --- a/Generalized_map/include/CGAL/Generalized_map_storages.h +++ b/Generalized_map/include/CGAL/Generalized_map_storages.h @@ -19,7 +19,7 @@ #include #include -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"") #endif @@ -426,7 +426,7 @@ namespace CGAL { } // namespace CGAL -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic pop") #endif #endif // CGAL_GENERALIZED_MAP_STORAGES_H // diff --git a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp index 792c948ac9e..2d3510d149d 100644 --- a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp +++ b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp @@ -7,9 +7,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif #include // Qt headers @@ -253,9 +251,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wktk *.WKT);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -274,9 +270,7 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::read_multi_point_WKT(ifs, points); -#endif } else { diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp index b92b9e3600d..de99028b06f 100644 --- a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp +++ b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp @@ -7,9 +7,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif #include #include @@ -220,9 +218,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.wpts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -241,14 +237,12 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector point_3_s; CGAL::read_multi_point_WKT(ifs, point_3_s); for(const K::Point_3& point_3 : point_3_s) { points.push_back(Apollonius_site_2(K::Point_2(point_3.x(), point_3.y()), point_3.z())); } -#endif } else{ K::Weighted_point_2 p; while(ifs >> p) { @@ -270,15 +264,12 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".reg.cgal", tr("Weighted Points (*.wpts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files(*.wkt *.WKT);;" - #endif "All (*)")); if(! fileName.isEmpty()){ std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector points; for(Apollonius::Sites_iterator vit = ag.sites_begin(), @@ -290,7 +281,6 @@ MainWindow::on_actionSavePoints_triggered() vit->weight())); } CGAL::write_multi_point_WKT(ofs, points); -#endif } else for(Apollonius::Sites_iterator diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp index 574e61bd33d..fa6f3c1dd50 100644 --- a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp +++ b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp @@ -15,9 +15,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // Qt headers #include @@ -479,9 +477,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.WKT *.wkt);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -497,14 +493,12 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::read_multi_point_WKT(ifs, points); for(K::Point_2 p : points) { mc.insert(p); me.insert(p); } -#endif } else { @@ -532,15 +526,12 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || 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 (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector out_pts; out_pts.reserve(std::distance(mc.points_begin(), mc.points_end())); @@ -548,7 +539,6 @@ MainWindow::on_actionSavePoints_triggered() pit != mc.points_end(); ++pit) out_pts.push_back(*pit); CGAL::write_multi_point_WKT(ofs, out_pts); -#endif } else { diff --git a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp index 4c6df0c026c..8cd2cd19f77 100644 --- a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp +++ b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp @@ -10,9 +10,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // Qt headers #include @@ -216,9 +214,7 @@ MainWindow::on_actionLoadLineAndCircularArcs_triggered() tr("Open Line and Circular Arc File"), ".", tr("Edge files (*.arc)\n" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT)\n" - #endif )); if(! fileName.isEmpty()){ open(fileName); @@ -236,7 +232,6 @@ MainWindow::open(QString fileName) double x,y; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) //read pairs as Line_arc_2 and triplets as circular_arc_2 do { @@ -279,7 +274,6 @@ MainWindow::open(QString fileName) } }while(ifs.good() && !ifs.eof()); ifs.close(); -#endif } else { 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 4e1399bd680..5028c398dcc 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 @@ -24,9 +24,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif #include @@ -275,9 +273,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -295,9 +291,7 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::read_multi_point_WKT(ifs, m_sites); -#endif } else { @@ -322,16 +316,12 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || 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 (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::write_multi_point_WKT(ofs, m_sites); -#endif }else for(Points::iterator it = m_sites.begin(); it != m_sites.end(); ++it) 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 a945124a01b..ebf0581fa31 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 @@ -8,9 +8,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // Qt headers #include @@ -355,9 +353,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -376,9 +372,7 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::read_multi_point_WKT(ifs, points); -#endif } else { @@ -404,15 +398,12 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || 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 (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector points; points.reserve(std::distance(triang.unique_vertices_begin(), triang.unique_vertices_end())); @@ -424,7 +415,6 @@ MainWindow::on_actionSavePoints_triggered() points.push_back(vit->point()); } CGAL::write_multi_point_WKT(ofs, points); -#endif } else { diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp index 98b001a7c28..58cb263d020 100644 --- a/GraphicsView/demo/Polygon/Polygon_2.cpp +++ b/GraphicsView/demo/Polygon/Polygon_2.cpp @@ -13,9 +13,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // Qt headers #include @@ -234,9 +232,7 @@ MainWindow::on_actionLoadPolygon_triggered() ".", tr( "Polyline files (*.polygons.cgal);;" "WSL files (*.wsl);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All file (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -251,12 +247,10 @@ MainWindow::open(QString fileName) poly.clear(); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::Polygon_with_holes_2 P; CGAL::read_polygon_WKT(ifs, P); poly = Polygon2(P.outer_boundary().begin(), P.outer_boundary().end()); -#endif } else { @@ -276,20 +270,16 @@ MainWindow::on_actionSavePolygon_triggered() tr("Save Polygon"), ".", tr( "Polyline files (*.polygons.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All file (*)")); if(! fileName.isEmpty()){ std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::Polygon_2 P(poly.begin(), poly.end()); CGAL::Polygon_with_holes_2 Pwh(P); CGAL::write_polygon_WKT(ofs, Pwh); -#endif } else ofs << poly; 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 1e53c0603bb..b5af8b11c16 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp @@ -25,9 +25,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif //#include // the two base classes @@ -248,10 +246,8 @@ MainWindow::open(QString fileName) loadEdgConstraints(fileName); this->addToRecentFiles(fileName); } else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) loadWKTConstraints(fileName); this->addToRecentFiles(fileName); -#endif } } } @@ -264,9 +260,7 @@ MainWindow::on_actionLoadSegments_triggered() ".", tr("Edge files (*.edg);;" "Polyline files (*.polygons.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT)" - #endif )); open(fileName); } @@ -342,12 +336,10 @@ MainWindow::loadEdgConstraints(QString fileName) void MainWindow::loadWKTConstraints(QString - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) fileName - #endif ) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) + typedef CGAL::Polygon_with_holes_2 Polygon; typedef std::vector LineString; @@ -414,7 +406,6 @@ MainWindow::loadWKTConstraints(QString }while(ifs.good() && !ifs.eof()); Q_EMIT( changed()); actionRecenter->trigger(); -#endif } void 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 76f7d443e5b..32c060483a0 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 @@ -23,9 +23,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif //#include // the two base classes @@ -270,10 +268,8 @@ MainWindow::open(QString fileName) loadSitesInput(fileName); this->addToRecentFiles(fileName); } else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) loadWKT(fileName); this->addToRecentFiles(fileName); -#endif } } } @@ -291,9 +287,7 @@ MainWindow::on_actionLoadSegments_triggered() "Pts files (*.pts);;" "Edge files (*.edg);;" "Polylines files (*.polygons.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.WKT *.wkt)" - #endif )); open(fileName); } @@ -388,13 +382,8 @@ MainWindow::loadPoints(QString fileName) } void -MainWindow::loadWKT(QString - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) - fileName - #endif - ) +MainWindow::loadWKT(QString fileName ) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::ifstream ifs(qPrintable(fileName)); //Points do @@ -479,7 +468,6 @@ MainWindow::loadWKT(QString Q_EMIT( changed()); actionRecenter->trigger(); -#endif } void diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp index b5db6faf4aa..072987b8c62 100644 --- a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp +++ b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp @@ -20,9 +20,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // for viewportsBbox #include @@ -252,9 +250,7 @@ MainWindow::on_actionLoadSegments_triggered() tr("Open segment file"), ".", tr("Edge files (*.edg);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -270,7 +266,6 @@ MainWindow::open(QString fileName) std::ifstream ifs(qPrintable(fileName)); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector > mls; CGAL::read_multi_linestring_WKT(ifs, mls); for(const std::vector& ls : mls) @@ -280,7 +275,6 @@ MainWindow::open(QString fileName) Segment_2 seg(ls[0], ls[1]); input.push_back(seg); } -#endif } else { std::copy(std::istream_iterator(ifs), @@ -304,16 +298,13 @@ MainWindow::on_actionSaveSegments_triggered() tr("Save points"), ".", tr("Edge files (*.edg);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ std::ofstream ofs(qPrintable(fileName)); ofs.precision(12); if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector >mls; for(const Segment_2& seg : input) { @@ -323,7 +314,6 @@ MainWindow::on_actionSaveSegments_triggered() mls.push_back(ls); } CGAL::write_multi_linestring_WKT(ofs, mls); -#endif } else std::copy(input.begin(), input.end(), std::ostream_iterator(ofs, "\n")); diff --git a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp index ba7171f1a85..011daef2925 100644 --- a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp +++ b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp @@ -17,9 +17,7 @@ // GraphicsView items and event filters (input classes) #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // the two base classes #include "ui_Spatial_searching_2.h" @@ -249,9 +247,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -271,9 +267,7 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::read_multi_point_WKT(ifs, points); -#endif } else{ while(ifs >> p) { diff --git a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp index 75aebdee97e..afd277fecbb 100644 --- a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp +++ b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp @@ -21,9 +21,7 @@ // for viewportsBbox #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // the two base classes #include "ui_Stream_lines_2.h" #include @@ -167,14 +165,10 @@ MainWindow::generate() void MainWindow::on_actionLoadPoints_triggered() { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) -#endif QString fileName = QFileDialog::getOpenFileName(this, tr("Open grid file"), "." - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) ,tr("WKT files (*.wkt *.WKT)") - #endif ); if(! fileName.isEmpty()){ open(fileName); @@ -194,7 +188,6 @@ MainWindow::open(QString fileName) iXSize = iYSize = 512; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector > mp; int size= -1; do @@ -216,10 +209,6 @@ MainWindow::open(QString fileName) { regular_grid->set_field(i, j, Vector(mp[j][i].x(), mp[j][i].y())); } -#else - QApplication::restoreOverrideCursor(); - return; -#endif } else{ unsigned int x_samples, y_samples; @@ -248,7 +237,6 @@ MainWindow::open(QString fileName) void MainWindow::on_actionSavePoints_triggered() { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) QString fileName = QFileDialog::getSaveFileName(this, tr("Save points"), ".", @@ -270,7 +258,6 @@ MainWindow::on_actionSavePoints_triggered() } ofs.close(); } -#endif } diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 43bf20943e2..be4315874a2 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -25,9 +25,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // Qt headers #include @@ -528,9 +526,7 @@ MainWindow::open(QString fileName) } else if(fileName.endsWith(".poly")){ loadPolyConstraints(fileName); } else if(fileName.endsWith(".wkt")){ -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) loadWKT(fileName); -#endif } this->addToRecentFiles(fileName); } @@ -549,21 +545,14 @@ MainWindow::on_actionLoadConstraints_triggered() "Poly files (*.poly);;" "Plg files (*.plg);;" "CGAL files (*.cpts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.WKT *.wkt);;" - #endif "All (*)")); open(fileName); } void -MainWindow::loadWKT(QString - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) - filename - #endif - ) +MainWindow::loadWKT(QString filename) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) //Polygons todo : make it multipolygons std::ifstream ifs(qPrintable(filename)); do @@ -651,7 +640,6 @@ MainWindow::loadWKT(QString discoverComponents(cdt, m_seeds); Q_EMIT( changed()); actionRecenter->trigger(); -#endif } void diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp index 266bdddbac5..05e7791b0f5 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp @@ -23,9 +23,7 @@ #include "TriangulationPointInputAndConflictZone.h" #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif // for viewportsBbox #include @@ -322,9 +320,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.WKT *.wkt);;" - #endif "All files (*)")); if(! fileName.isEmpty()){ open(fileName); @@ -343,9 +339,7 @@ MainWindow::open(QString fileName) std::vector points; if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::read_multi_point_WKT(ifs, points); -#endif } else while(ifs >> p) { @@ -370,15 +364,12 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".", tr("CGAL files (*.pts.cgal);;" - #if (! defined(BOOST_GCC) || 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 (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector points; points.reserve(dt.number_of_vertices()); for(Delaunay::Finite_vertices_iterator @@ -389,7 +380,6 @@ MainWindow::on_actionSavePoints_triggered() points.push_back(vit->point()); } CGAL::write_multi_point_WKT(ofs, points); -#endif } else 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 9022ebdf2d7..1be86bffe21 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -5,9 +5,7 @@ // CGAL headers #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif #include // Qt headers @@ -248,9 +246,7 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), ".", tr("Weighted Points (*.wpts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All (*)")); if(! fileName.isEmpty()){ @@ -258,14 +254,12 @@ MainWindow::on_actionLoadPoints_triggered() std::vector points; if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector points_3; CGAL::read_multi_point_WKT(ifs, points_3); for(const K::Point_3& p : points_3) { points.push_back(Weighted_point_2(K::Point_2(p.x(), p.y()), p.z())); } -#endif } else { @@ -289,15 +283,12 @@ MainWindow::on_actionSavePoints_triggered() tr("Save points"), ".reg.cgal", tr("Weighted Points (*.wpts.cgal);;" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) "WKT files (*.wkt *.WKT);;" - #endif "All (*)")); if(! fileName.isEmpty()){ std::ofstream ofs(qPrintable(fileName)); if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector points_3; for(Regular::Finite_vertices_iterator vit = dt.finite_vertices_begin(), @@ -309,7 +300,6 @@ MainWindow::on_actionSavePoints_triggered() vit->point().weight())); } CGAL::write_multi_point_WKT(ofs, points_3); -#endif } else { diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index e4d90fb23b6..562687a290a 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -469,11 +469,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) uniquely_add_flags(CGAL_CXX_FLAGS "-frounding-math") endif() - if("${GCC_VERSION}" MATCHES "^4.2") - message(STATUS "Using gcc version 4.2. Adding -fno-strict-aliasing") - uniquely_add_flags(CGAL_CXX_FLAGS "-fno-strict-aliasing") - endif() - if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "alpha") message(STATUS "Using gcc on alpha. Adding -mieee -mfp-rounding-mode=d") uniquely_add_flags(CGAL_CXX_FLAGS "-mieee -mfp-rounding-mode=d") diff --git a/Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp b/Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp index 08c507a9883..61d55a338b9 100644 --- a/Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp +++ b/Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp @@ -18,7 +18,7 @@ int main() { #endif #if __has_feature(cxx_thread_local) || \ - ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) + ( defined(__GNUC__) && __cplusplus >= 201103L ) return 0; #else return 1; diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index a2bf589f727..1dc3ee4cd68 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -489,7 +489,7 @@ using std::max; // Macro CGAL_ASSUME // Call a builtin of the compiler to pass a hint to the compiler -#if __has_builtin(__builtin_unreachable) || (CGAL_GCC_VERSION >= 40500 && !__STRICT_ANSI__) +#if __has_builtin(__builtin_unreachable) || (!__STRICT_ANSI__) // From g++ 4.5, there exists a __builtin_unreachable() // Also in LLVM/clang # define CGAL_ASSUME(EX) if(!(EX)) { __builtin_unreachable(); } @@ -509,20 +509,20 @@ using std::max; #endif #if __has_feature(cxx_thread_local) || \ - ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \ + ( defined(__GNUC__) && __cplusplus >= 201103L ) || \ ( _MSC_VER >= 1900 ) // see also Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp #define CGAL_CAN_USE_CXX11_THREAD_LOCAL #endif #if (__has_include() && __cplusplus >= 201103L ) | \ - ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \ + ( defined(__GNUC__) && __cplusplus >= 201103L ) || \ ( _MSC_VER >= 1700 ) #define CGAL_CAN_USE_CXX11_MUTEX #endif #if (__has_include() && __cplusplus >= 201103L ) || \ - ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \ + ( defined(__GNUC__) && __cplusplus >= 201103L ) || \ ( _MSC_VER >= 1700 ) #define CGAL_CAN_USE_CXX11_ATOMIC #endif @@ -537,7 +537,7 @@ using std::max; #define LEDA_NUMBERS_DLL 1 // Helper macros to disable macros -#if defined(__clang__) || (BOOST_GCC >= 40600) +#if defined(__clang__) || defined(BOOST_GCC) # define CGAL_PRAGMA_DIAG_PUSH _Pragma("GCC diagnostic push") # define CGAL_PRAGMA_DIAG_POP _Pragma("GCC diagnostic pop") #else diff --git a/Installation/include/CGAL/export/helpers.h b/Installation/include/CGAL/export/helpers.h index 89ef455859f..4b384c71f4b 100644 --- a/Installation/include/CGAL/export/helpers.h +++ b/Installation/include/CGAL/export/helpers.h @@ -23,7 +23,7 @@ # define CGAL_DLL_EXPORT __declspec(dllexport) # define CGAL_DLL_LOCAL # else - #if __GNUC__ >= 4 + #ifdef __GNUC__ #define CGAL_DLL_IMPORT __attribute__ ((visibility ("default"))) #define CGAL_DLL_EXPORT __attribute__ ((visibility ("default"))) #define CGAL_DLL_LOCAL __attribute__ ((visibility ("hidden"))) diff --git a/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h b/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h index c3095592caa..b426792ea16 100644 --- a/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h +++ b/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h @@ -19,7 +19,7 @@ #include #include -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"") #endif @@ -476,7 +476,7 @@ namespace CGAL { } // namespace CGAL -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic pop") #endif diff --git a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h index c48ec047dfd..c1baa30409e 100644 --- a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h +++ b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h @@ -18,7 +18,7 @@ #include #include -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"") #endif @@ -460,7 +460,7 @@ namespace CGAL { Items_, Alloc_, Concurrent_tag>::null_handle = nullptr; } // namespace CGAL -#if (BOOST_GCC >= 40900) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic pop") #endif #endif // CGAL_GMAP_LINEAR_CELL_COMPLEX_STORAGES_H // diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h index 1752de0ebb6..950910925a3 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h @@ -12,7 +12,7 @@ #ifndef CGAL_VECTOR_AVX4_H #define CGAL_VECTOR_AVX4_H -#if !defined __AVX__ || (__GNUC__ * 100 + __GNUC_MINOR__ < 408) +#if !defined __AVX__ #error Requires AVX and gcc 4.8+ #endif #include diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h index 0359b7b4f45..1330bf6fa77 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h @@ -13,7 +13,7 @@ #define CGAL_VECTOR_SSE2_H // Check what needs adapting for clang, intel and microsoft -#if !defined __SSE2__ || (__GNUC__ * 100 + __GNUC_MINOR__ < 408) +#if !defined __SSE2__ #error Requires SSE2 and gcc 4.8+ #endif #include // FIXME: other platforms call it differently diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp index 9a1ae6be859..3f13d8970d5 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -1,13 +1,4 @@ #include -#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) - -#include -int main() -{ - std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; -} - -#else //#define BOOST_RESULT_OF_USE_DECLTYPE 1 #include @@ -768,5 +759,3 @@ int main(){ test4>(); #endif } - -#endif diff --git a/Number_types/include/CGAL/FPU.h b/Number_types/include/CGAL/FPU.h index 0a324d451a6..8a8cd8a5fea 100644 --- a/Number_types/include/CGAL/FPU.h +++ b/Number_types/include/CGAL/FPU.h @@ -172,7 +172,7 @@ inline double IA_opacify(double x) // Intel has a bug where -mno-sse still defines __SSE__ and __SSE2__ // (-mno-sse2 works though), no work-around for now. # if defined __SSE2_MATH__ || (defined __INTEL_COMPILER && defined __SSE2__) -# if __GNUC__ * 100 + __GNUC_MINOR__ >= 409 +# if defined(__GNUC__) // ICEs in reload/LRA with older versions. asm volatile ("" : "+gx"(x) ); # else @@ -275,8 +275,7 @@ inline __m128d IA_opacify128_weak(__m128d x) inline __m128d swap_m128d(__m128d x){ # ifdef __llvm__ return __builtin_shufflevector(x, x, 1, 0); -# elif defined __GNUC__ && !defined __INTEL_COMPILER \ - && __GNUC__ * 100 + __GNUC_MINOR__ >= 407 +# elif defined __GNUC__ && !defined __INTEL_COMPILER return __builtin_shuffle(x, (__m128i){ 1, 0 }); # else return _mm_shuffle_pd(x, x, 1); diff --git a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h index 72e81ce0786..076e78cee57 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h @@ -17,7 +17,7 @@ #include -#if (BOOST_GCC >= 40800) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") #endif @@ -264,7 +264,7 @@ OutputIterator partition_approx_convex_2(InputIterator first, } } -#if (BOOST_GCC >= 40800) +#if defined(BOOST_GCC) _Pragma("GCC diagnostic pop") #endif #endif // CGAL_PARTITION_APPROX_CONVEX_H diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_regular_triangulation_traits_3.h b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_regular_triangulation_traits_3.h index c59d2d48472..61a9aaf0a80 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_regular_triangulation_traits_3.h +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_regular_triangulation_traits_3.h @@ -10,7 +10,7 @@ // Author(s) : Aymeric PELLE // Mael Rouxel-Labbé -#if (__GNUC__>4) || (__GNUC__ == 4 && __GNUC_MINOR__ >=6) +#if defined(__GNUC__) # pragma GCC diagnostic ignored "-Wunused-but-set-variable" #endif diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_traits_3.h b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_traits_3.h index 37ebb32353b..c8ee3c576c6 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_traits_3.h +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_traits_3.h @@ -11,7 +11,7 @@ // Author(s) : Mariette Yvinec // Manuel Caroli -#if (__GNUC__>4) || (__GNUC__ == 4 && __GNUC_MINOR__ >=6) +#if defined(__GNUC__) # pragma GCC diagnostic ignored "-Wunused-but-set-variable" #endif 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 b4060dc87a7..0420f3316d1 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 @@ -11,9 +11,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif //#define CGAL_TESTING_POLYLINE_SIMPLIFICATION //#define CGAL_POLYLINE_SIMPLIFICATION_TRACE_LEVEL 15 @@ -342,10 +340,8 @@ MainWindow::open(QString fileName) this->addToRecentFiles(fileName); } else if(fileName.endsWith(".wkt")){ -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) loadWKT(fileName); this->addToRecentFiles(fileName); -#endif } } } @@ -356,9 +352,7 @@ MainWindow::on_actionLoadConstraints_triggered() QString fileName = QFileDialog::getOpenFileName(this, tr("Open Constraint File"), "../data" - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) ,tr("Polylines (*.osm *.wkt);;") - #endif ); open(fileName); } @@ -375,13 +369,8 @@ std::string trim_right ( std::string str ) return std::string("") ; } -void MainWindow::loadWKT(QString - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) - fileName - #endif - ) +void MainWindow::loadWKT(QString fileName) { -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) typedef std::vector MultiPoint; typedef std::vector LineString; @@ -419,7 +408,6 @@ void MainWindow::loadWKT(QString Q_EMIT( changed()); actionRecenter->trigger(); -#endif } 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 73c02b71ef0..405f6df707d 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 @@ -9,9 +9,7 @@ #include #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include -#endif namespace PS = CGAL::Polyline_simplification_2; @@ -56,7 +54,6 @@ 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 (! defined(BOOST_GCC) || BOOST_GCC >= 40500) const bool remove_points = false; CT ct; Polygon_with_holes_2 P; @@ -75,9 +72,6 @@ int main(int argc, char* argv[]) PS::simplify(ct, cid, Cost(), Stop(0.5), remove_points); ct.remove_points_without_corresponding_vertex(cid); print(ct, cid); -#else - ifs.close(); -#endif return 0; } diff --git a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp index 2654f8b212c..b76d665234b 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp @@ -1,7 +1,6 @@ #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include #include @@ -58,10 +57,3 @@ int main(int argc, char* argv[]) return 0; } -#else - -int main() -{ - return 0; -} -#endif 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 ddc6d108a90..8bdacfd5ff3 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp @@ -1,6 +1,5 @@ #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include #include @@ -30,9 +29,3 @@ int main(int argc, char* argv[]) 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 58cf2dc6e15..8277f62cc20 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp @@ -1,7 +1,5 @@ #include #include - -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include #include @@ -17,10 +15,8 @@ typedef K::Point_2 Point_2; typedef std::deque Polyline_2; typedef PS::Stop_above_cost_threshold Stop; typedef PS::Squared_distance_cost Cost; -#endif int main(int argc, char* argv[]) { - #if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) Polyline_2 polyline; std::ifstream ifs( (argc==1)?"data/polyline.wkt":argv[1]); CGAL::read_linestring_WKT(ifs, polyline); @@ -32,6 +28,5 @@ int main(int argc, char* argv[]) for(std::size_t i=0; i < result.size(); ++i){ std::cout << result[i] << std::endl; } -#endif return 0; } diff --git a/Stream_support/examples/Stream_support/Linestring_WKT.cpp b/Stream_support/examples/Stream_support/Linestring_WKT.cpp index 2f0c12b8629..04fb6d5dc8c 100644 --- a/Stream_support/examples/Stream_support/Linestring_WKT.cpp +++ b/Stream_support/examples/Stream_support/Linestring_WKT.cpp @@ -8,8 +8,6 @@ #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include //typedef CGAL::Simple_cartesian Kernel; @@ -42,9 +40,3 @@ int main(int argc, char* argv[]) } return 0; } -#else -int main() -{ - return 0; -} -#endif diff --git a/Stream_support/examples/Stream_support/Point_WKT.cpp b/Stream_support/examples/Stream_support/Point_WKT.cpp index 064671a6895..10255ff6226 100644 --- a/Stream_support/examples/Stream_support/Point_WKT.cpp +++ b/Stream_support/examples/Stream_support/Point_WKT.cpp @@ -7,8 +7,6 @@ #include #include #include - -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include //typedef CGAL::Simple_cartesian Kernel; @@ -29,9 +27,3 @@ int main(int argc, char* argv[]) is.close(); return 0; } -#else -int main() -{ - return 0; -} -#endif diff --git a/Stream_support/examples/Stream_support/Polygon_WKT.cpp b/Stream_support/examples/Stream_support/Polygon_WKT.cpp index fe8350a33e5..712e1aa39e5 100644 --- a/Stream_support/examples/Stream_support/Polygon_WKT.cpp +++ b/Stream_support/examples/Stream_support/Polygon_WKT.cpp @@ -9,8 +9,6 @@ #include #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include //typedef CGAL::Simple_cartesian Kernel; @@ -44,9 +42,3 @@ int main(int argc, char* argv[]) } return 0; } -#else -int main() -{ - return 0; -} -#endif diff --git a/Stream_support/examples/Stream_support/read_WKT.cpp b/Stream_support/examples/Stream_support/read_WKT.cpp index 94e5a63320e..f9a61ba31cd 100644 --- a/Stream_support/examples/Stream_support/read_WKT.cpp +++ b/Stream_support/examples/Stream_support/read_WKT.cpp @@ -7,11 +7,7 @@ #include #include #include - -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include - //typedef CGAL::Simple_cartesian Kernel; typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; @@ -44,9 +40,3 @@ int main(int argc, char* argv[]) } return 0; } -#else -int main() -{ - return 0; -} -#endif diff --git a/Stream_support/include/CGAL/IO/WKT.h b/Stream_support/include/CGAL/IO/WKT.h index 69ee1bb8387..2a11ea581ee 100644 --- a/Stream_support/include/CGAL/IO/WKT.h +++ b/Stream_support/include/CGAL/IO/WKT.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_H #define CGAL_IO_WKT_H -#if defined(DOXYGEN_RUNNING) || (!defined(BOOST_GCC) || BOOST_GCC >= 40500)) - #include #include #include @@ -576,6 +574,4 @@ bool read_WKT(std::istream& is, } // namespace CGAL -#endif // BOOST VERSION CHECKS - #endif // CGAL_IO_WKT_H diff --git a/Stream_support/include/CGAL/IO/WKT/traits_linestring.h b/Stream_support/include/CGAL/IO/WKT/traits_linestring.h index 90b28309eb7..9893446e078 100644 --- a/Stream_support/include/CGAL/IO/WKT/traits_linestring.h +++ b/Stream_support/include/CGAL/IO/WKT/traits_linestring.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_TRAITS_LINESTRING_H #define CGAL_IO_WKT_TRAITS_LINESTRING_H -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include #include @@ -36,5 +34,4 @@ struct tag > } // namespace geometry } // namespace boost -#endif // BOOST VERSION CHECKS #endif // CGAL_IO_WKT_TRAITS_LINESTRING_H diff --git a/Stream_support/include/CGAL/IO/WKT/traits_multilinestring.h b/Stream_support/include/CGAL/IO/WKT/traits_multilinestring.h index 009124169ca..5f74d539049 100644 --- a/Stream_support/include/CGAL/IO/WKT/traits_multilinestring.h +++ b/Stream_support/include/CGAL/IO/WKT/traits_multilinestring.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_TRAITS_MULTILINESTRING_H #define CGAL_IO_WKT_TRAITS_MULTILINESTRING_H -#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include #include @@ -37,5 +35,4 @@ struct tag > } // namespace geometry } // namespace boost -#endif // BOOST VERSION CHECKS #endif // CGAL_IO_WKT_TRAITS_MULTILINESTRING_H diff --git a/Stream_support/include/CGAL/IO/WKT/traits_multipoint.h b/Stream_support/include/CGAL/IO/WKT/traits_multipoint.h index 84bdb29609b..08ed5526cd8 100644 --- a/Stream_support/include/CGAL/IO/WKT/traits_multipoint.h +++ b/Stream_support/include/CGAL/IO/WKT/traits_multipoint.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_TRAITS_MULTIPOINT_H #define CGAL_IO_WKT_TRAITS_MULTIPOINT_H -#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include #include @@ -36,6 +34,4 @@ struct tag > } // namespace traits } // namespace geometry } // namespace boost - -#endif // BOOST VERSION CHECKS #endif // CGAL_IO_WKT_TRAITS_MULTIPOINT_H diff --git a/Stream_support/include/CGAL/IO/WKT/traits_multipolygon.h b/Stream_support/include/CGAL/IO/WKT/traits_multipolygon.h index 08931e55ff0..5d5bb653340 100644 --- a/Stream_support/include/CGAL/IO/WKT/traits_multipolygon.h +++ b/Stream_support/include/CGAL/IO/WKT/traits_multipolygon.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H #define CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H -#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include #include @@ -37,6 +35,5 @@ struct tag > } // namespace geometry } // namespace boost -#endif // BOOST VERSION CHECKS #endif // CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H diff --git a/Stream_support/include/CGAL/IO/WKT/traits_point.h b/Stream_support/include/CGAL/IO/WKT/traits_point.h index fe9540f76b2..a4c486ba1da 100644 --- a/Stream_support/include/CGAL/IO/WKT/traits_point.h +++ b/Stream_support/include/CGAL/IO/WKT/traits_point.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_TRAITS_POINT_H #define CGAL_IO_WKT_TRAITS_POINT_H -#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include #include @@ -69,5 +67,4 @@ struct access, 1> } // namespace geometry } // namespace boost -#endif // BOOST VERSION CHECKS #endif // CGAL_IO_WKT_TRAITS_POINT_H diff --git a/Stream_support/include/CGAL/IO/WKT/traits_point_3.h b/Stream_support/include/CGAL/IO/WKT/traits_point_3.h index fcc7eeffb82..dfb9c4d9a77 100644 --- a/Stream_support/include/CGAL/IO/WKT/traits_point_3.h +++ b/Stream_support/include/CGAL/IO/WKT/traits_point_3.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_TRAITS_POINT_3_H #define CGAL_IO_WKT_TRAITS_POINT_3_H -#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include #include @@ -76,5 +74,4 @@ struct access, 2> } // namespace geometry } // namespace boost -#endif // BOOST VERSION CHECKS #endif // CGAL_IO_WKT_TRAITS_POINT_3_H diff --git a/Stream_support/include/CGAL/IO/WKT/traits_polygon.h b/Stream_support/include/CGAL/IO/WKT/traits_polygon.h index 639ef39d33a..fcc0129f063 100644 --- a/Stream_support/include/CGAL/IO/WKT/traits_polygon.h +++ b/Stream_support/include/CGAL/IO/WKT/traits_polygon.h @@ -15,8 +15,6 @@ #ifndef CGAL_IO_WKT_TRAITS_POLYGON_H #define CGAL_IO_WKT_TRAITS_POLYGON_H -#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500) - #include #include #include @@ -101,5 +99,4 @@ struct range_value > } // namespace boost -#endif // BOOST VERSION CHECKS #endif // CGAL_IO_WKT_TRAITS_POLYGON_H diff --git a/Stream_support/include/CGAL/internal/Geometry_container.h b/Stream_support/include/CGAL/internal/Geometry_container.h index d1214ceca17..e5be891d9b2 100644 --- a/Stream_support/include/CGAL/internal/Geometry_container.h +++ b/Stream_support/include/CGAL/internal/Geometry_container.h @@ -14,7 +14,6 @@ #ifndef GEOMETRY_CONTAINER_H #define GEOMETRY_CONTAINER_H -#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include #include @@ -118,4 +117,3 @@ struct range_mutable_iterator > }//end boost #endif // GEOMETRY_CONTAINER_H -#endif diff --git a/Stream_support/test/Stream_support/test_WKT.cpp b/Stream_support/test/Stream_support/test_WKT.cpp index b3fba823b45..65dc900a336 100644 --- a/Stream_support/test/Stream_support/test_WKT.cpp +++ b/Stream_support/test/Stream_support/test_WKT.cpp @@ -1,6 +1,5 @@ #include -#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #include #include @@ -279,9 +278,4 @@ int main() return EXIT_SUCCESS; } -#else -int main(int, char**) -{ - return EXIT_SUCCESS; -} -#endif + diff --git a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp index f9db18d22c0..a21e34a08c1 100644 --- a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp +++ b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp @@ -1,13 +1,4 @@ #include -#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) - -#include -int main() -{ - std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; -} - -#else #include #include @@ -48,5 +39,3 @@ int main() } return 0; } - -#endif diff --git a/Triangulation/examples/Triangulation/triangulation.cpp b/Triangulation/examples/Triangulation/triangulation.cpp index 0666542b0dd..966b771cbdb 100644 --- a/Triangulation/examples/Triangulation/triangulation.cpp +++ b/Triangulation/examples/Triangulation/triangulation.cpp @@ -1,12 +1,4 @@ #include -#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) -#include -int main() -{ - std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; -} - -#else #include #include @@ -50,4 +42,3 @@ int main() return 0; } -#endif diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index bc92fa6c796..0af45e570e6 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -1,13 +1,4 @@ #include -#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) - -#include -int main() -{ - std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; -} - -#else #include #include @@ -145,5 +136,3 @@ int main(int argc, char **argv) cerr << endl; return 0; } - -#endif diff --git a/Triangulation/test/Triangulation/test_torture.cpp b/Triangulation/test/Triangulation/test_torture.cpp index e66fc6e3ea3..b5c39b84295 100644 --- a/Triangulation/test/Triangulation/test_torture.cpp +++ b/Triangulation/test/Triangulation/test_torture.cpp @@ -1,13 +1,4 @@ #include -#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) - -#include -int main() -{ - std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; -} - -#else #include #include @@ -152,4 +143,3 @@ int main(int argc, char **argv) return 0; } -#endif diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp index c86d6c4edd1..e913825dbaa 100644 --- a/Triangulation/test/Triangulation/test_triangulation.cpp +++ b/Triangulation/test/Triangulation/test_triangulation.cpp @@ -1,12 +1,4 @@ #include -#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) -#include -int main() -{ - std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; -} - -#else #include #include #include @@ -166,5 +158,3 @@ int main(int argc, char **argv) cerr << std::endl; return 0; } - -#endif