songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean-up boost_version reqs

This commit is contained in:
Maxime Gimeno 2021-05-12 15:03:53 +02:00
parent e7b91b92b8
commit 393ae7dae6
55 changed files with 122 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h
View File

@ -21,7 +21,6 @@
#include <boost/optional.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/variant/apply_visitor.hpp>
#if BOOST_VERSION >= 105000
# if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable: 4996)
@ -30,9 +29,6 @@
# if defined(BOOST_MSVC)
# pragma warning(pop)
# endif
#else
# include <queue>
#endif
#include <CGAL/assertions.h>
@ -54,11 +50,7 @@ public:
// BVH_node::traversal this is done through the function parameter
// nb_primitives in the recursion.
typedef
#if BOOST_VERSION >= 105000
boost::heap::priority_queue< Node_ptr_with_ft, boost::heap::compare< std::greater<Node_ptr_with_ft> > >
#else
std::priority_queue< Node_ptr_with_ft>
#endif
Heap_type;
typename AABB_traits::Intersection
@ -167,14 +159,8 @@ private:
const Node* node;
size_type nb_primitives;
FT value;
#if BOOST_VERSION >= 105000
bool operator<(const Node_ptr_with_ft& other) const { return value < other.value; }
bool operator>(const Node_ptr_with_ft& other) const { return value > other.value; }
#else
bool operator>(const Node_ptr_with_ft& other) const { return value < other.value; }
bool operator<(const Node_ptr_with_ft& other) const { return value > other.value; }
#endif
};
struct as_ray_param_visitor {

23
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
View File

@ -738,35 +738,12 @@ public:
// read values
is >> rep._m_xy;
#if BOOST_VERSION < 104300
// EBEB: This fixes a bug in optional_io.hpp, reported to Fernando on
// April 27, 2010, don't know whether the fix makes it into
// boost 1_43.
if (!rep._m_xy) {
swallow(is, '-');
}
#endif
swallow(is, ',');
is >> rep._m_x;
#if BOOST_VERSION < 104300
if (!rep._m_x) {
swallow(is, '-');
}
#endif
swallow(is, ',');
is >> rep._m_curve;
#if BOOST_VERSION < 104300
if (!rep._m_curve) {
swallow(is, '-');
}
#endif
swallow(is, ',');
is >> rep._m_arcno;
#if BOOST_VERSION < 104300
if (!rep._m_arcno) {
swallow(is, '-');
}
#endif
swallow(is, ',');
is >> rep._m_location;

7
BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h
View File

@ -27,12 +27,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/compressed_sparse_row_graph.hpp>
#if BOOST_VERSION >= 104400 // at this version kolmogorov_max_flow become depricated.
# include <boost/graph/boykov_kolmogorov_max_flow.hpp>
#else
# include <boost/graph/kolmogorov_max_flow.hpp>
#endif
#include <boost/graph/boykov_kolmogorov_max_flow.hpp>
#include <vector>

4
Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h
View File

@ -692,11 +692,7 @@ public:
}
// Write property tree to XML file
boost::property_tree::write_xml(output, tree,
#if BOOST_VERSION >= 105600
boost::property_tree::xml_writer_make_settings<std::string>(' ', 3));
#else
boost::property_tree::xml_writer_make_settings<char>(' ', 3));
#endif
}
/*!

4
Filtered_kernel/include/CGAL/Filtered_predicate_with_state.h
View File

@ -75,11 +75,7 @@ Filtered_predicate_with_state<EP,AP,C2E,C2A,O1,Protection>::
CGAL_BRANCH_PROFILER_BRANCH(tmp);
Protect_FPU_rounding<!Protection> p(CGAL_FE_TONEAREST);
if(! oep){
#if BOOST_VERSION < 105600
oep = EP(c2e(o1));
#else
oep.emplace(c2e(o1));
#endif
}
return (*oep)(c2e(args)...);
}

15
Generator/include/CGAL/random_convex_hull_in_disc_2.h
View File

@ -68,19 +68,6 @@ void generate_points_annulus(long n, double a, double b, double small_radius,
}
if (n == 1) // generation of a point
{
#if BOOST_VERSION < 104700
boost::uniform_real<double> random_squared_radius_distribution(
small_radius * small_radius / (big_radius * big_radius), 1);
boost::uniform_real<double> random_angle_distribution(a, b);
boost::variate_generator<
GEN&, boost::uniform_real<double> > random_angle(gen, random_angle_distribution);
boost::variate_generator<
GEN&, boost::uniform_real<double> > random_squared_radius(gen, random_squared_radius_distribution);
#else
boost::random::uniform_real_distribution<double> random_squared_radius_distribution(
small_radius * small_radius / (big_radius * big_radius), 1);
@ -90,8 +77,6 @@ void generate_points_annulus(long n, double a, double b, double small_radius,
boost::random::variate_generator<
GEN&, boost::random::uniform_real_distribution<double> > random_squared_radius(gen, random_squared_radius_distribution);
#endif
double alpha = random_angle();
double r = big_radius * std::sqrt(random_squared_radius());
typedef Creator_uniform_2<double, P> Creator;

6
GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp
View File

@ -7,7 +7,7 @@
#include <CGAL/Alpha_shape_2.h>
#include <CGAL/Alpha_shape_face_base_2.h>
#include <CGAL/Alpha_shape_vertex_base_2.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
#include <CGAL/point_generators_2.h>
@ -253,7 +253,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wktk *.WKT);;"
#endif
"All files (*)"));
@ -274,7 +274,7 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points);
#endif
}

10
GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp
View File

@ -7,7 +7,7 @@
#include <CGAL/Apollonius_graph_hierarchy_2.h>
#include <CGAL/Apollonius_graph_filtered_traits_2.h>
#include <CGAL/point_generators_2.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -220,7 +220,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.wpts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All files (*)"));
@ -241,7 +241,7 @@ MainWindow::open(QString fileName)
std::vector<Apollonius_site_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> point_3_s;
CGAL::read_multi_point_WKT(ifs, point_3_s);
for(const K::Point_3& point_3 : point_3_s)
@ -270,7 +270,7 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"),
".reg.cgal",
tr("Weighted Points (*.wpts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files(*.wkt *.WKT);;"
#endif
"All (*)"));
@ -278,7 +278,7 @@ MainWindow::on_actionSavePoints_triggered()
std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points;
for(Apollonius::Sites_iterator
vit = ag.sites_begin(),

10
GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp
View File

@ -15,7 +15,7 @@
#include <CGAL/Polygon_2.h>
#include <CGAL/min_quadrilateral_2.h>
#include <CGAL/rectangular_p_center_2.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -479,7 +479,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;"
#endif
"All files (*)"));
@ -497,7 +497,7 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points);
for(K::Point_2 p : points)
{
@ -532,7 +532,7 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;"
#endif
"All files (*)"));
@ -540,7 +540,7 @@ MainWindow::on_actionSavePoints_triggered()
std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_2> out_pts;
out_pts.reserve(std::distance(mc.points_begin(),
mc.points_end()));

6
GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp
View File

@ -10,7 +10,7 @@
#include <CGAL/intersections.h>
#include <CGAL/Circular_kernel_2.h>
#include <CGAL/Object.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -216,7 +216,7 @@ MainWindow::on_actionLoadLineAndCircularArcs_triggered()
tr("Open Line and Circular Arc File"),
".",
tr("Edge files (*.arc)\n"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT)\n"
#endif
));
@ -236,7 +236,7 @@ MainWindow::open(QString fileName)
double x,y;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
//read pairs as Line_arc_2 and triplets as circular_arc_2
do
{

10
GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp
View File

@ -24,7 +24,7 @@
#include <QInputDialog>
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -275,7 +275,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All files (*)"));
@ -295,7 +295,7 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, m_sites);
#endif
}
@ -322,14 +322,14 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::write_multi_point_WKT(ofs, m_sites);
#endif
}else

10
GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp
View File

@ -8,7 +8,7 @@
#include <CGAL/Periodic_2_Delaunay_triangulation_2.h>
#include <CGAL/Periodic_2_Delaunay_triangulation_traits_2.h>
#include <CGAL/point_generators_2.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -355,7 +355,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All files (*)"));
@ -376,7 +376,7 @@ MainWindow::open(QString fileName)
std::vector<Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points);
#endif
}
@ -404,7 +404,7 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All files (*)"));
@ -412,7 +412,7 @@ MainWindow::on_actionSavePoints_triggered()
std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<Point_2> points;
points.reserve(std::distance(triang.unique_vertices_begin(),
triang.unique_vertices_end()));

10
GraphicsView/demo/Polygon/Polygon_2.cpp
View File

@ -13,7 +13,7 @@
#include <CGAL/minkowski_sum_2.h>
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -234,7 +234,7 @@ MainWindow::on_actionLoadPolygon_triggered()
".",
tr( "Polyline files (*.polygons.cgal);;"
"WSL files (*.wsl);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All file (*)"));
@ -251,7 +251,7 @@ MainWindow::open(QString fileName)
poly.clear();
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::Polygon_with_holes_2<K> P;
CGAL::read_polygon_WKT(ifs, P);
poly = Polygon2(P.outer_boundary().begin(),
@ -276,7 +276,7 @@ MainWindow::on_actionSavePolygon_triggered()
tr("Save Polygon"),
".",
tr( "Polyline files (*.polygons.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All file (*)"));
@ -284,7 +284,7 @@ MainWindow::on_actionSavePolygon_triggered()
std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::Polygon_2<K> P(poly.begin(),
poly.end());
CGAL::Polygon_with_holes_2<K> Pwh(P);

10
GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp
View File

@ -25,7 +25,7 @@
#include <CGAL/Qt/GraphicsViewPolylineInput.h>
#include <CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h>
#include <CGAL/Constraints_loader.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
//#include <CGAL/Qt/Converter.h>
@ -248,7 +248,7 @@ MainWindow::open(QString fileName)
loadEdgConstraints(fileName);
this->addToRecentFiles(fileName);
} else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKTConstraints(fileName);
this->addToRecentFiles(fileName);
#endif
@ -264,7 +264,7 @@ MainWindow::on_actionLoadSegments_triggered()
".",
tr("Edge files (*.edg);;"
"Polyline files (*.polygons.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT)"
#endif
));
@ -342,12 +342,12 @@ MainWindow::loadEdgConstraints(QString fileName)
void
MainWindow::loadWKTConstraints(QString
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
typedef CGAL::Polygon_with_holes_2<K> Polygon;
typedef std::vector<K::Point_2> LineString;

10
GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp
View File

@ -23,7 +23,7 @@
#include <CGAL/Qt/GraphicsViewPolylineInput.h>
#include <CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h>
#include <CGAL/Constraints_loader.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
//#include <CGAL/Qt/Converter.h>
@ -270,7 +270,7 @@ MainWindow::open(QString fileName)
loadSitesInput(fileName);
this->addToRecentFiles(fileName);
} else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKT(fileName);
this->addToRecentFiles(fileName);
#endif
@ -291,7 +291,7 @@ MainWindow::on_actionLoadSegments_triggered()
"Pts files (*.pts);;"
"Edge files (*.edg);;"
"Polylines files (*.polygons.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt)"
#endif
));
@ -389,12 +389,12 @@ MainWindow::loadPoints(QString fileName)
void
MainWindow::loadWKT(QString
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::ifstream ifs(qPrintable(fileName));
//Points
do

10
GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp
View File

@ -20,7 +20,7 @@
#include <CGAL/Qt/SegmentsGraphicsItem.h>
#include <CGAL/Qt/PolylinesGraphicsItem.h>
#include <CGAL/Qt/GraphicsViewPolylineInput.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -252,7 +252,7 @@ MainWindow::on_actionLoadSegments_triggered()
tr("Open segment file"),
".",
tr("Edge files (*.edg);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All files (*)"));
@ -270,7 +270,7 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> > mls;
CGAL::read_multi_linestring_WKT(ifs, mls);
for(const std::vector<Point_2>& ls : mls)
@ -304,7 +304,7 @@ MainWindow::on_actionSaveSegments_triggered()
tr("Save points"),
".",
tr("Edge files (*.edg);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All files (*)"));
@ -313,7 +313,7 @@ MainWindow::on_actionSaveSegments_triggered()
ofs.precision(12);
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> >mls;
for(const Segment_2& seg : input)
{

6
GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp
View File

@ -17,7 +17,7 @@
// GraphicsView items and event filters (input classes)
#include <CGAL/Qt/PointsInKdTreeGraphicsItem.h>
#include <CGAL/Qt/utility.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -249,7 +249,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All files (*)"));
@ -271,7 +271,7 @@ MainWindow::open(QString fileName)
std::vector<K::Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points);
#endif
}

10
GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp
View File

@ -21,7 +21,7 @@
// for viewportsBbox
#include <CGAL/Qt/utility.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
// the two base classes
@ -167,12 +167,12 @@ MainWindow::generate()
void
MainWindow::on_actionLoadPoints_triggered()
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#endif
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open grid file"),
"."
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
,tr("WKT files (*.wkt *.WKT)")
#endif
);
@ -194,7 +194,7 @@ MainWindow::open(QString fileName)
iXSize = iYSize = 512;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> > mp;
int size= -1;
do
@ -248,7 +248,7 @@ MainWindow::open(QString fileName)
void
MainWindow::on_actionSavePoints_triggered()
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
QString fileName = QFileDialog::getSaveFileName(this,
tr("Save points"),
".",

10
GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
View File

@ -25,7 +25,7 @@
#include <CGAL/point_generators_2.h>
#include <CGAL/Timer.h>
#include <CGAL/IO/write_vtu.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -528,7 +528,7 @@ MainWindow::open(QString fileName)
} else if(fileName.endsWith(".poly")){
loadPolyConstraints(fileName);
} else if(fileName.endsWith(".wkt")){
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKT(fileName);
#endif
}
@ -549,7 +549,7 @@ MainWindow::on_actionLoadConstraints_triggered()
"Poly files (*.poly);;"
"Plg files (*.plg);;"
"CGAL files (*.cpts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;"
#endif
"All (*)"));
@ -558,12 +558,12 @@ MainWindow::on_actionLoadConstraints_triggered()
void
MainWindow::loadWKT(QString
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
filename
#endif
)
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
//Polygons todo : make it multipolygons
std::ifstream ifs(qPrintable(filename));
do

10
GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp
View File

@ -23,7 +23,7 @@
#include "TriangulationPointInputAndConflictZone.h"
#include <CGAL/Qt/TriangulationGraphicsItem.h>
#include <CGAL/Qt/VoronoiGraphicsItem.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -322,7 +322,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;"
#endif
"All files (*)"));
@ -343,7 +343,7 @@ MainWindow::open(QString fileName)
std::vector<K::Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points);
#endif
}
@ -370,7 +370,7 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;"
#endif
"All files (*)"));
@ -378,7 +378,7 @@ MainWindow::on_actionSavePoints_triggered()
std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_2> points;
points.reserve(dt.number_of_vertices());
for(Delaunay::Finite_vertices_iterator

10
GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp
View File

@ -5,7 +5,7 @@
// CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Regular_triangulation_2.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -248,7 +248,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("Weighted Points (*.wpts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All (*)"));
@ -258,7 +258,7 @@ MainWindow::on_actionLoadPoints_triggered()
std::vector<Weighted_point_2> points;
if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points_3;
CGAL::read_multi_point_WKT(ifs, points_3);
for(const K::Point_3& p : points_3)
@ -289,7 +289,7 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"),
".reg.cgal",
tr("Weighted Points (*.wpts.cgal);;"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;"
#endif
"All (*)"));
@ -297,7 +297,7 @@ MainWindow::on_actionSavePoints_triggered()
std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points_3;
for(Regular::Finite_vertices_iterator
vit = dt.finite_vertices_begin(),

108
Installation/include/CGAL/config.h
View File

@ -127,20 +127,6 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
// bug-fix for g++-5.x and Boost.Config<1.57
// https://svn.boost.org/trac/boost/ticket/10500
#if BOOST_VERSION < 105700 && BOOST_GCC < 60000 && \
! defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(BOOST_HAS_VARIADIC_TMPL)
# undef BOOST_HAS_VARIADIC_TMPL
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif
// workaround for the bug https://svn.boost.org/trac10/ticket/12534
// That bug was introduced in Boost 1.62 and fixed in 1.63.
#if BOOST_VERSION >= 106200 && BOOST_VERSION < 106300
# include <boost/container/flat_map.hpp>
#endif
// Hack: Boost<1.55 does not detect correctly the C++11 features of ICC.
// We declare by hand two features that we need (variadic templates and
// rvalue references).
@ -187,68 +173,50 @@
// feature is not available, even if that is wrong.
// ----------------------------------------------------------------------//
#if defined(BOOST_NO_CXX11_RANGE_BASED_FOR) || BOOST_VERSION < 105000
#define CGAL_CFG_NO_CPP0X_RANGE_BASED_FOR 1
#endif
#if defined(BOOST_NO_0X_HDR_ARRAY) || \
defined(BOOST_NO_CXX11_HDR_ARRAY) || BOOST_VERSION < 104000
#if defined(BOOST_NO_0X_HDR_ARRAY)
#define CGAL_CFG_NO_CPP0X_ARRAY 1
#endif
#if defined(BOOST_NO_0X_HDR_UNORDERED_SET) || \
defined(BOOST_NO_0X_HDR_UNORDERED_MAP) || \
defined(BOOST_NO_CXX11_HDR_UNORDERED_SET) || \
defined(BOOST_NO_CXX11_HDR_UNORDERED_MAP) || \
(defined(_MSC_VER) && (_MSC_VER == 1800)) // std::unordered_set is very bad in MSVC2013
#define CGAL_CFG_NO_CPP0X_UNORDERED 1
#endif
#if defined( BOOST_NO_0X_HDR_THREAD) || \
defined( BOOST_NO_CXX11_HDR_THREAD)
#if defined( BOOST_NO_0X_HDR_THREAD)
#define CGAL_CFG_NO_STD_THREAD 1
#endif
#if defined(BOOST_NO_DECLTYPE) || \
defined(BOOST_NO_CXX11_DECLTYPE) || (BOOST_VERSION < 103600)
#if defined(BOOST_NO_DECLTYPE)
#define CGAL_CFG_NO_CPP0X_DECLTYPE 1
#endif
#if defined(BOOST_NO_DELETED_FUNCTIONS) || \
defined(BOOST_NO_DEFAULTED_FUNCTIONS) || \
defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) || \
defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || (BOOST_VERSION < 103600) || \
(defined(_MSC_VER) && _MSC_VER < 1900) // MSVC 2013 has only partial support
#define CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS 1
#endif
#if defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS) || \
defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) || \
(BOOST_VERSION < 104100)
#if defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS)
#define CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES 1
#endif
#if defined(BOOST_NO_INITIALIZER_LISTS) || \
defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) || (BOOST_VERSION < 103900)
#if defined(BOOST_NO_INITIALIZER_LISTS)
#define CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS 1
#endif
#if defined(BOOST_MSVC)
#define CGAL_CFG_NO_CPP0X_ISFINITE 1 // used in <CGAL/CORE/Filter.h>
#endif
#if defined(BOOST_NO_LONG_LONG) || (BOOST_VERSION < 103600)
#if defined(BOOST_NO_LONG_LONG)
#define CGAL_CFG_NO_CPP0X_LONG_LONG 1
#endif
#if defined(BOOST_NO_LAMBDAS) || \
defined(BOOST_NO_CXX11_LAMBDAS) || BOOST_VERSION < 104000
#if defined(BOOST_NO_LAMBDAS)
#define CGAL_CFG_NO_CPP0X_LAMBDAS 1
#endif
#if defined(BOOST_NO_RVALUE_REFERENCES) || \
defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || (BOOST_VERSION < 103600)
#if defined(BOOST_NO_RVALUE_REFERENCES)
#define CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE 1
#endif
#if defined(BOOST_NO_STATIC_ASSERT) || \
defined(BOOST_NO_CXX11_STATIC_ASSERT) || (BOOST_VERSION < 103600)
#if defined(BOOST_NO_STATIC_ASSERT)
#define CGAL_CFG_NO_CPP0X_STATIC_ASSERT 1
#endif
#if defined(BOOST_NO_0X_HDR_TUPLE) || \
defined(BOOST_NO_CXX11_HDR_TUPLE) || (BOOST_VERSION < 104000)
#if defined(BOOST_NO_0X_HDR_TUPLE)
#define CGAL_CFG_NO_CPP0X_TUPLE 1
#endif
#if defined(BOOST_NO_VARIADIC_TEMPLATES) || \
defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || (BOOST_VERSION < 103600)
#if defined(BOOST_NO_VARIADIC_TEMPLATES)
#define CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES 1
#endif
// never use TR1
@ -258,7 +226,7 @@
#if !defined(__GNUC__) || defined(__INTEL_COMPILER)
#define CGAL_CFG_NO_STATEMENT_EXPRESSIONS 1
#endif
#if defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) || (BOOST_VERSION < 105100) || _MSC_VER==1800
#if _MSC_VER==1800
#define CGAL_CFG_NO_CPP0X_UNIFIED_INITIALIZATION_SYNTAX
#endif
#if __cplusplus < 201103L && !(_MSC_VER >= 1600)
@ -266,13 +234,10 @@
#define CGAL_CFG_NO_CPP0X_NEXT_PREV 1
#endif
#if defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATIONS) \
|| defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS) \
|| defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS) \
|| (BOOST_VERSION < 103600)
|| defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
#define CGAL_CFG_NO_CPP0X_EXPLICIT_CONVERSION_OPERATORS 1
#endif
#if defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) || \
defined(BOOST_NO_TEMPLATE_ALIASES) || (BOOST_VERSION < 103900)
#if defined(BOOST_NO_TEMPLATE_ALIASES)
#define CGAL_CFG_NO_CPP0X_TEMPLATE_ALIASES 1
#endif
@ -303,11 +268,6 @@
# define CGAL_CXX20 1
#endif
#if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) || BOOST_VERSION < 105000
#define CGAL_CFG_NO_STD_HASH 1
#define CGAL_CFG_NO_STD_FUNCTION 1
#endif
//----------------------------------------------------------------------//
// As std::unary_function and std::binary_function are deprecated
@ -365,31 +325,10 @@
// Big endian or little endian machine.
// ====================================
#if (BOOST_VERSION >= 105500)
# include <boost/predef.h>
# if BOOST_ENDIAN_BIG_BYTE
#include <boost/predef.h>
#if BOOST_ENDIAN_BIG_BYTE
# define CGAL_BIG_ENDIAN
# elif BOOST_ENDIAN_LITTLE_BYTE
# define CGAL_LITTLE_ENDIAN
# endif
#elif defined (__GLIBC__)
# include <endian.h>
# if (__BYTE_ORDER == __LITTLE_ENDIAN)
# define CGAL_LITTLE_ENDIAN
# elif (__BYTE_ORDER == __BIG_ENDIAN)
# define CGAL_BIG_ENDIAN
# endif
#elif defined(__sparc) || defined(__sparc__) \
|| defined(_POWER) || defined(__powerpc__) \
|| defined(__ppc__) || defined(__hppa) \
|| defined(_MIPSEB) || defined(_POWER) \
|| defined(__s390__)
# define CGAL_BIG_ENDIAN
#elif defined(__i386__) || defined(__alpha__) \
|| defined(__x86_64) || defined(__x86_64__) \
|| defined(__ia64) || defined(__ia64__) \
|| defined(_M_IX86) || defined(_M_IA64) \
|| defined(_M_ALPHA) || defined(_WIN64)
#elif BOOST_ENDIAN_LITTLE_BYTE
# define CGAL_LITTLE_ENDIAN
#endif
@ -576,15 +515,13 @@ using std::max;
#define CGAL_CAN_USE_CXX11_THREAD_LOCAL
#endif
#if ( BOOST_VERSION >= 105000 && ! defined(BOOST_NO_CXX11_HDR_MUTEX) ) || \
(__has_include(<mutex>) && __cplusplus >= 201103L ) | \
#if (__has_include(<mutex>) && __cplusplus >= 201103L ) | \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_MUTEX
#endif
#if ( BOOST_VERSION >= 105600 && ! defined(BOOST_NO_CXX11_HDR_ATOMIC) ) || \
(__has_include(<atomic>) && __cplusplus >= 201103L ) || \
#if (__has_include(<atomic>) && __cplusplus >= 201103L ) || \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_ATOMIC
@ -656,7 +593,7 @@ typedef const void * Nullptr_t; // Anticipate C++0x's std::nullptr_t
} //namespace CGAL
//Support for c++11 noexcept
#if BOOST_VERSION > 104600 && !defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_NOEXCEPT)
#if !defined(BOOST_NO_NOEXCEPT)
#define CGAL_NOEXCEPT(x) noexcept(x)
#else
#define CGAL_NOEXCEPT(x)
@ -679,11 +616,6 @@ typedef const void * Nullptr_t; // Anticipate C++0x's std::nullptr_t
# define CGAL_FALLTHROUGH while(false){}
#endif
// https://svn.boost.org/trac/boost/ticket/2839
#if defined(BOOST_MSVC) && BOOST_VERSION < 105600
#define CGAL_CFG_BOOST_VARIANT_SWAP_BUG 1
#endif
#ifndef CGAL_NO_ASSERTIONS
# define CGAL_NO_ASSERTIONS_BOOL false
#else

2
Mesh_3/benchmark/Mesh_3/CMakeLists.txt
View File

@ -79,7 +79,7 @@ if(Boost_PROGRAM_OPTIONS_FOUND)
list(APPEND CGAL_3RD_PARTY_LIBRARIES ${Boost_LIBRARIES})
endif()
if(Boost_FOUND AND Boost_VERSION GREATER 103400)
if(Boost_FOUND )
# Compilable benchmark
set(BENCHMARK_SOURCE_FILES "concurrency.cpp")
add_msvc_precompiled_header("StdAfx.h" "StdAfx.cpp" BENCHMARK_SOURCE_FILES)

13
Mesh_3/include/CGAL/Mesh_3/Is_mesh_domain_field_3.h
View File

@ -21,17 +21,12 @@
#include <CGAL/license/Mesh_3.h>
#include <boost/config.hpp>
#if BOOST_VERSION >= 106600
# include <boost/callable_traits/is_invocable.hpp>
#else
# include <boost/mpl/has_xxx.hpp>
#endif
#include <boost/callable_traits/is_invocable.hpp>
#include <CGAL/tags.h>
namespace CGAL {
namespace Mesh_3 {
#if BOOST_VERSION >= 106600
template <typename Tr, typename Type>
struct Is_mesh_domain_field_3 :
public CGAL::Boolean_tag
@ -45,12 +40,6 @@ namespace CGAL {
>::value
>
{};
#else // Boost before 1.66
BOOST_MPL_HAS_XXX_TRAIT_DEF(FT)
template <typename Tr, typename Type>
struct Is_mesh_domain_field_3 : public Boolean_tag<has_FT<Type>::value>
{};
#endif // Boost before 1.66
} // end namespace Mesh_3
} // end namespace CGAL

2
Mesh_3/include/CGAL/Mesh_cell_criteria_3.h
View File

@ -21,9 +21,7 @@
#include <CGAL/Mesh_3/Is_mesh_domain_field_3.h>
#include <boost/config.hpp>
#if BOOST_VERSION >= 106600
# include <boost/callable_traits/is_invocable.hpp>
#endif
#include <type_traits>

12
Mesh_3/test/Mesh_3/test_mesh_capsule_var_distance_bound.cpp
View File

@ -40,24 +40,12 @@ FT capsule_function(const Point& p)
else if(z < FT(-5)) return base+CGAL::square(z+5);
else return base;
}
#if BOOST_VERSION >= 106600
auto field = [](const Point& p, const int, const Mesh_domain::Index)
{
if(p.z() > 2) return 0.025;
if(p.z() < -3) return 0.01;
else return 1.;
};
#else
struct Field {
typedef ::FT FT;
FT operator()(const Point& p, const int, const Mesh_domain::Index) const {
if(p.z() > 2) return 0.025;
if(p.z() < -3) return 0.01;
else return 1;
}
} field;
#endif
int main()
{

6
Mesher_level/include/CGAL/Double_map.h
View File

@ -22,13 +22,7 @@
#include <CGAL/function_objects.h> // for CGAL::Identity
#include <boost/version.hpp>
#if BOOST_VERSION >= 103500
# define CGAL_USE_BOOST_BIMAP
#endif
#if defined(CGAL_USE_BOOST_BIMAP) && BOOST_VERSION == 104100
#include <CGAL/internal/container_fwd_fixed.hpp>
#endif
#ifdef CGAL_USE_BOOST_BIMAP
# if defined(BOOST_MSVC)

5
Number_types/include/CGAL/boost_mp.h
View File

@ -13,14 +13,13 @@
#define CGAL_BOOST_MP_H
#include <CGAL/config.h>
// This could check BOOST_VERSION >= 105300, but before 1.56 there is no
// implicit conversion from double, which makes it hard to use in CGAL.
// It is easier to disable this number type completely for old versions.
// Before 1.63, I/O is broken. Again, disabling the whole file is just the
// easy solution.
// MSVC had trouble with versions <= 1.69:
// https://github.com/boostorg/multiprecision/issues/98
#if !defined CGAL_DO_NOT_USE_BOOST_MP && BOOST_VERSION >= 106300 && \
#if !defined CGAL_DO_NOT_USE_BOOST_MP && \
(!defined _MSC_VER || BOOST_VERSION >= 107000)
#define CGAL_USE_BOOST_MP 1

9
Point_set_processing_3/test/Point_set_processing_3/normal_estimation_test.cpp
View File

@ -226,15 +226,6 @@ bool run_mst_orient_normals(PointList& points, // input points + input/output no
unsigned int nb_neighbors_mst, // number of neighbors
const std::vector<Vector>& original_normals) // may be empty
{
#if (BOOST_VERSION / 100) == 1054
std::cerr <<
"In run_mst_orient_normals():\n"
"NOTICE: This function is incompatible with Boost 1.54, "
"and will not be tested. See the following bug:\n"
" https://svn.boost.org/trac/boost/ticket/9012\n";
return true;
#endif // Boost version is 1.54
std::cerr << "Orients Normals with a Minimum Spanning Tree (k="<< nb_neighbors_mst << ")...\n";
CGAL::Timer task_timer; task_timer.start();

10
Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp
View File

@ -11,7 +11,7 @@
#include <CGAL/assertions_behaviour.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Timer.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -342,7 +342,7 @@ MainWindow::open(QString fileName)
this->addToRecentFiles(fileName);
}
else if(fileName.endsWith(".wkt")){
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKT(fileName);
this->addToRecentFiles(fileName);
#endif
@ -356,7 +356,7 @@ MainWindow::on_actionLoadConstraints_triggered()
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open Constraint File"),
"../data"
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
,tr("Polylines (*.osm *.wkt);;")
#endif
);
@ -376,12 +376,12 @@ std::string trim_right ( std::string str )
}
void MainWindow::loadWKT(QString
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
typedef std::vector<Point_2> MultiPoint;
typedef std::vector<Point_2> LineString;

4
Polyline_simplification_2/examples/Polyline_simplification_2/points_and_vertices.cpp
View File

@ -9,7 +9,7 @@
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Constrained_triangulation_plus_2.h>
#include <CGAL/Polyline_simplification_2/simplify.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
@ -56,7 +56,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 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
const bool remove_points = false;
CT ct;
Polygon_with_holes_2 P;

2
Polyline_simplification_2/examples/Polyline_simplification_2/simplify.cpp
View File

@ -1,7 +1,7 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream>
#include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

2
Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polygon.cpp
View File

@ -1,6 +1,6 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream>
#include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

4
Polyline_simplification_2/examples/Polyline_simplification_2/simplify_polyline.cpp
View File

@ -1,7 +1,7 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream>
#include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -20,7 +20,7 @@ typedef PS::Squared_distance_cost Cost;
#endif
int main(int argc, char* argv[])
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#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);

8
Property_map/include/CGAL/property_map.h
View File

@ -15,13 +15,7 @@
#include <CGAL/value_type_traits.h>
#include <boost/version.hpp>
#if BOOST_VERSION >= 104000
#include <boost/property_map/property_map.hpp>
#else
#include <boost/property_map.hpp>
#include <boost/vector_property_map.hpp>
#endif
#include <boost/property_map/property_map.hpp>
#include <boost/tuple/tuple.hpp>
#include <CGAL/tuple.h>

8
STL_Extension/include/CGAL/demangle.h
View File

@ -12,22 +12,14 @@
#ifndef CGAL_DEMANGLE_H
#define CGAL_DEMANGLE_H
#if BOOST_VERSION >= 105600
#include <boost/core/demangle.hpp>
#else
#include <boost/units/detail/utility.hpp>
#endif
namespace CGAL {
inline std::string demangle(const char* name)
{
#if BOOST_VERSION >= 105600
return boost::core::demangle(name);
#else
return boost::units::detail::demangle(name);
#endif
}

8
STL_Extension/include/CGAL/iterator.h
View File

@ -1379,22 +1379,14 @@ public:
template<BOOST_VARIANT_ENUM_PARAMS(typename T)>
Self& operator=(const boost::variant<BOOST_VARIANT_ENUM_PARAMS(T) >& t) {
internal::Output_visitor<Self> visitor(this);
#if BOOST_VERSION==105800
t.apply_visitor(visitor);
#else
boost::apply_visitor(visitor, t);
#endif
return *this;
}
template<BOOST_VARIANT_ENUM_PARAMS(typename T)>
Self& operator=(const boost::optional< boost::variant<BOOST_VARIANT_ENUM_PARAMS(T) > >& t) {
internal::Output_visitor<Self> visitor(this);
#if BOOST_VERSION==105800
if(t) t->apply_visitor(visitor);
#else
if(t) boost::apply_visitor(visitor, *t);
#endif
return *this;
}

4
Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h
View File

@ -19,10 +19,6 @@
#include <boost/utility.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION == 106000
//ice_not is deprecated in boost 1.60 but used within adjacency_matrix.hpp
#include <boost/type_traits/detail/ice_not.hpp>
#endif
#include <boost/graph/adjacency_matrix.hpp>
#if defined(BOOST_MSVC)

2
Stream_support/examples/Stream_support/Linestring_WKT.cpp
View File

@ -8,7 +8,7 @@
#include <fstream>
#include <vector>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>

2
Stream_support/examples/Stream_support/Point_WKT.cpp
View File

@ -8,7 +8,7 @@
#include <fstream>
#include <vector>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;

2
Stream_support/examples/Stream_support/Polygon_WKT.cpp
View File

@ -9,7 +9,7 @@
#include <vector>
#include <deque>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>

2
Stream_support/examples/Stream_support/read_WKT.cpp
View File

@ -8,7 +8,7 @@
#include <fstream>
#include <vector>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>

2
Stream_support/include/CGAL/IO/WKT.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_H
#define CGAL_IO_WKT_H
#if defined(DOXYGEN_RUNNING) || (BOOST_VERSION >= 105600 && (!defined(BOOST_GCC) || BOOST_GCC >= 40500))
#if defined(DOXYGEN_RUNNING) || (!defined(BOOST_GCC) || BOOST_GCC >= 40500))
#include <CGAL/Point_2.h>
#include <CGAL/Point_3.h>

2
Stream_support/include/CGAL/IO/WKT/traits_linestring.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_TRAITS_LINESTRING_H
#define CGAL_IO_WKT_TRAITS_LINESTRING_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>

2
Stream_support/include/CGAL/IO/WKT/traits_multilinestring.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_TRAITS_MULTILINESTRING_H
#define CGAL_IO_WKT_TRAITS_MULTILINESTRING_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>

2
Stream_support/include/CGAL/IO/WKT/traits_multipoint.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_TRAITS_MULTIPOINT_H
#define CGAL_IO_WKT_TRAITS_MULTIPOINT_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>

2
Stream_support/include/CGAL/IO/WKT/traits_multipolygon.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H
#define CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>

2
Stream_support/include/CGAL/IO/WKT/traits_point.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_TRAITS_POINT_H
#define CGAL_IO_WKT_TRAITS_POINT_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/number_utils.h>
#include <CGAL/Point_2.h>

2
Stream_support/include/CGAL/IO/WKT/traits_point_3.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_TRAITS_POINT_3_H
#define CGAL_IO_WKT_TRAITS_POINT_3_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/number_utils.h>
#include <CGAL/Point_3.h>

2
Stream_support/include/CGAL/IO/WKT/traits_polygon.h
View File

@ -15,7 +15,7 @@
#ifndef CGAL_IO_WKT_TRAITS_POLYGON_H
#define CGAL_IO_WKT_TRAITS_POLYGON_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/Polygon_2.h>
#include <CGAL/Polygon_with_holes_2.h>

2
Stream_support/include/CGAL/internal/Geometry_container.h
View File

@ -14,7 +14,7 @@
#ifndef GEOMETRY_CONTAINER_H
#define GEOMETRY_CONTAINER_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <boost/geometry/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/shared_ptr.hpp>

2
Stream_support/test/Stream_support/test_WKT.cpp
View File

@ -1,6 +1,6 @@
#include <iostream>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

11
Surface_mesh_topology/include/CGAL/Path_on_surface.h
View File

@ -882,10 +882,7 @@ public:
return boost::algorithm::knuth_morris_pratt_search(pp2.m_path.begin(),
pp2.m_path.end(),
pp1.m_path.begin(),
pp1.m_path.end())
#if BOOST_VERSION>=106200
.first
#endif
pp1.m_path.end()).first
!=pp2.m_path.end();
}
bool operator!=(const Self& other) const
@ -1118,11 +1115,7 @@ public:
auto itMatch = boost::algorithm::knuth_morris_pratt_search(pp2.m_path.begin() + 1,
pp2.m_path.end(),
pp1.m_path.begin(),
pp1.m_path.end())
#if BOOST_VERSION>=106200
.first
#endif
;
pp1.m_path.end()).first;
/// It can be proved that the first match location is the length of match
auto primitiveSize = itMatch - pp2.m_path.begin();
auto originalLength = pp1.length();

2
TDS_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -1009,9 +1009,7 @@ public:
Vertex_extractor(Vertex_handle _v, OutputIterator _output, const Tds* _t, Filter _filter):
v(_v), treat(_output), t(_t), filter(_filter)
{
#if ( BOOST_VERSION >= 105000 )
tmp_vertices.reserve(64);
#endif
}
void operator()(Cell_handle c) {

10
Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
View File

@ -29,12 +29,7 @@
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Triangulation_2/insert_constraints.h>
#if defined(BOOST_MSVC) && (BOOST_VERSION == 105500)
#include <set>
#else
#include <boost/container/flat_set.hpp>
#endif
namespace CGAL {
@ -987,12 +982,7 @@ insert_subconstraint(Vertex_handle vaa,
// edges may contain mirror edges. They no longer exist after triangulate_hole
// so we have to remove them before calling get_bounded_faces
if(! edges.empty()){
#if defined(BOOST_MSVC) && (BOOST_VERSION == 105500)
std::set<Face_handle> faces(intersected_faces.begin(), intersected_faces.end());
#else
boost::container::flat_set<Face_handle> faces(intersected_faces.begin(), intersected_faces.end());
#endif
for(typename List_edges::iterator it = edges.begin(); it!= edges.end();){
if(faces.find(it->first) != faces.end()){
typename List_edges::iterator it2 = it;