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

Merge pull request #5705 from maxGimeno/CGAL-Clean_up_boost_versions-maxGimeno

This commit is contained in:
Laurent Rineau 2021-07-28 10:14:38 +02:00 committed by GitHub
parent 4fb90756da e050373f88
commit 5759a800e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
88 changed files with 81 additions and 692 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 {

10
Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h
View File

@ -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

7
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h
View File

@ -122,15 +122,10 @@ public:
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::Around_point_circulator;
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#elif (__GNUC__ > 0)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::Around_point_circulator;
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
friend class Trapezoidal_decomposition_2<Traits>::Around_point_circulator;
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class Around_point_circulator;

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h
View File

@ -94,14 +94,8 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
#elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class In_face_iterator;
#endif

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h
View File

@ -94,14 +94,8 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
#elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class In_face_iterator;
#endif

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_trapezoid.h
View File

@ -91,14 +91,8 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
#elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class In_face_iterator;
#endif

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h
View File

@ -96,14 +96,8 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
#elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class In_face_iterator;
#endif

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h
View File

@ -93,14 +93,8 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
#elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class In_face_iterator;
#endif

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h
View File

@ -96,14 +96,8 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
#elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class In_face_iterator;
#endif

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h
View File

@ -92,14 +92,8 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
#elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else
friend class In_face_iterator;
#endif

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h
View File

@ -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

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;

30
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>
@ -242,12 +237,8 @@ public:
double max_flow()
{
#if BOOST_VERSION >= 104400
return boost::boykov_kolmogorov_max_flow(graph, cluster_source,
cluster_sink);
#else
return boost::kolmogorov_max_flow(graph, cluster_source, cluster_sink);
#endif
}
template <typename VertexLabelMap, typename InputVertexDescriptor>
@ -352,13 +343,8 @@ public:
void init_vertices()
{
#if BOOST_VERSION >= 104000
graph = Graph(boost::edges_are_unsorted, edge_map.begin(), edge_map.end(),
edge_map_weights.begin(), nb_vertices);
#else
graph= Graph(edge_map.begin(), edge_map.end(),
edge_map_weights.begin(), nb_vertices);
#endif
// PERFORMANCE PROBLEM
// need to set reverse edge map, I guess there is no way to do that before creating the graph
@ -379,7 +365,6 @@ public:
double max_flow()
{
#if BOOST_VERSION >= 104400
// since properties are bundled, defaults does not work need to specify them
return boost::boykov_kolmogorov_max_flow
(graph,
@ -392,19 +377,6 @@ public:
boost::get(boost::vertex_index,
graph), // this is not bundled, get it from graph (CRS provides one)
0, 1);
#else
return boost::kolmogorov_max_flow
(graph,
boost::get(&EdgeP::edge_capacity, graph),
boost::get(&EdgeP::edge_residual_capacity, graph),
boost::get(&EdgeP::edge_reverse, graph),
boost::get(&VertexP::vertex_predecessor, graph),
boost::get(&VertexP::vertex_color, graph),
boost::get(&VertexP::vertex_distance_t, graph),
boost::get(boost::vertex_index,
graph), // this is not bundled, get it from graph
0, 1);
#endif
}
template <typename VertexLabelMap, typename InputVertexDescriptor>

2
BGL/include/CGAL/boost/parameter.h
View File

@ -25,7 +25,7 @@
#include <boost/parameter/name.hpp>
#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\"")

2
Circular_kernel_2/benchmark/parser/benchmark_parser.cpp
View File

@ -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 (__GNUC__ > 0)
# define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else

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
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -55,7 +55,7 @@
#endif
#include <boost/config.hpp>
#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

4
Combinatorial_map/include/CGAL/Combinatorial_map_storages.h
View File

@ -19,7 +19,7 @@
#include <bitset>
#include <boost/config.hpp>
#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

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)...);
}

4
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -42,7 +42,7 @@
#endif
#include <boost/config.hpp>
#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

4
Generalized_map/include/CGAL/Generalized_map_storages.h
View File

@ -19,7 +19,7 @@
#include <bitset>
#include <boost/config.hpp>
#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 //

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,9 +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)
#include <CGAL/IO/WKT.h>
#endif
#include <CGAL/point_generators_2.h>
// Qt headers
@ -253,9 +251,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::IO::read_multi_point_WKT(ifs, points);
#endif
}
else
{

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

@ -7,9 +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)
#include <CGAL/IO/WKT.h>
#endif
#include <boost/random/linear_congruential.hpp>
#include <boost/random/uniform_real.hpp>
@ -220,9 +218,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.wpts.cgal);;"
#if BOOST_VERSION >= 105600 && (! 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<Apollonius_site_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> point_3_s;
CGAL::IO::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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points;
for(Apollonius::Sites_iterator
vit = ag.sites_begin(),
@ -290,7 +281,6 @@ MainWindow::on_actionSavePoints_triggered()
vit->weight()));
}
CGAL::IO::write_multi_point_WKT(ofs, points);
#endif
}
else
for(Apollonius::Sites_iterator

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

@ -15,9 +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)
#include <CGAL/IO/WKT.h>
#endif
// Qt headers
#include <QtGui>
@ -479,9 +477,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::IO::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 BOOST_VERSION >= 105600 && (! 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)
std::vector<K::Point_2> 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::IO::write_multi_point_WKT(ofs, out_pts);
#endif
}
else
{

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

@ -10,9 +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)
#include <CGAL/IO/WKT.h>
#endif
// Qt headers
#include <QtGui>
@ -216,9 +214,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)
"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 BOOST_VERSION >= 105600 && (! 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
{

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

@ -24,9 +24,7 @@
#include <QInputDialog>
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
#include <fstream>
@ -275,9 +273,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::IO::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 BOOST_VERSION >= 105600 && (! 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)
CGAL::IO::write_multi_point_WKT(ofs, m_sites);
#endif
}else
for(Points::iterator it = m_sites.begin();
it != m_sites.end(); ++it)

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

@ -8,9 +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)
#include <CGAL/IO/WKT.h>
#endif
// Qt headers
#include <QtGui>
@ -355,9 +353,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! 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<Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::IO::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 BOOST_VERSION >= 105600 && (! 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)
std::vector<Point_2> 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::IO::write_multi_point_WKT(ofs, points);
#endif
}
else
{

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

@ -13,9 +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)
#include <CGAL/IO/WKT.h>
#endif
// Qt headers
#include <QtGui>
@ -234,9 +232,7 @@ MainWindow::on_actionLoadPolygon_triggered()
".",
tr( "Polyline files (*.polygons.cgal);;"
"WSL files (*.wsl);;"
#if BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::Polygon_with_holes_2<K> P;
CGAL::IO::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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::Polygon_2<K> P(poly.begin(),
poly.end());
CGAL::Polygon_with_holes_2<K> Pwh(P);
CGAL::IO::write_polygon_WKT(ofs, Pwh);
#endif
}
else
ofs << poly;

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

@ -25,9 +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)
#include <CGAL/IO/WKT.h>
#endif
//#include <CGAL/Qt/Converter.h>
// 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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
typedef CGAL::Polygon_with_holes_2<K> Polygon;
typedef std::vector<K::Point_2> LineString;
@ -414,7 +406,6 @@ MainWindow::loadWKTConstraints(QString
}while(ifs.good() && !ifs.eof());
Q_EMIT( changed());
actionRecenter->trigger();
#endif
}
void

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

@ -23,9 +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)
#include <CGAL/IO/WKT.h>
#endif
//#include <CGAL/Qt/Converter.h>
// 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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
MainWindow::loadWKT(QString fileName )
{
#if BOOST_VERSION >= 105600 && (! 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

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

@ -20,9 +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)
#include <CGAL/IO/WKT.h>
#endif
// for viewportsBbox
#include <CGAL/Qt/utility.h>
@ -252,9 +250,7 @@ MainWindow::on_actionLoadSegments_triggered()
tr("Open segment file"),
".",
tr("Edge files (*.edg);;"
#if BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> > mls;
CGAL::IO::read_multi_linestring_WKT(ifs, mls);
for(const std::vector<Point_2>& 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<Segment_2>(ifs),
@ -304,16 +298,13 @@ MainWindow::on_actionSaveSegments_triggered()
tr("Save points"),
".",
tr("Edge files (*.edg);;"
#if BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> >mls;
for(const Segment_2& seg : input)
{
@ -323,7 +314,6 @@ MainWindow::on_actionSaveSegments_triggered()
mls.push_back(ls);
}
CGAL::IO::write_multi_linestring_WKT(ofs, mls);
#endif
}
else
std::copy(input.begin(), input.end(), std::ostream_iterator<Segment_2>(ofs, "\n"));

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

@ -17,9 +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)
#include <CGAL/IO/WKT.h>
#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 BOOST_VERSION >= 105600 && (! 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<K::Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::IO::read_multi_point_WKT(ifs, points);
#endif
}
else{
while(ifs >> p) {

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

@ -21,9 +21,7 @@
// for viewportsBbox
#include <CGAL/Qt/utility.h>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#endif
// the two base classes
#include "ui_Stream_lines_2.h"
#include <CGAL/Qt/DemosMainWindow.h>
@ -167,14 +165,10 @@ MainWindow::generate()
void
MainWindow::on_actionLoadPoints_triggered()
{
#if BOOST_VERSION >= 105600 && (! 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)
,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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> > 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 BOOST_VERSION >= 105600 && (! 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
}

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

@ -25,9 +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)
#include <CGAL/IO/WKT.h>
#endif
// Qt headers
#include <QtGui>
@ -528,9 +526,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)
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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;"
#endif
"All (*)"));
open(fileName);
}
void
MainWindow::loadWKT(QString
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
filename
#endif
)
MainWindow::loadWKT(QString filename)
{
#if BOOST_VERSION >= 105600 && (! 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

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

@ -23,9 +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)
#include <CGAL/IO/WKT.h>
#endif
// for viewportsBbox
#include <CGAL/Qt/utility.h>
@ -322,9 +320,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("CGAL files (*.pts.cgal);;"
#if BOOST_VERSION >= 105600 && (! 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<K::Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::IO::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 BOOST_VERSION >= 105600 && (! 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)
std::vector<K::Point_2> 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::IO::write_multi_point_WKT(ofs, points);
#endif
}
else
for(Delaunay::Finite_vertices_iterator

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

@ -5,9 +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)
#include <CGAL/IO/WKT.h>
#endif
#include <CGAL/point_generators_2.h>
// Qt headers
@ -248,9 +246,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"),
".",
tr("Weighted Points (*.wpts.cgal);;"
#if BOOST_VERSION >= 105600 && (! 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<Weighted_point_2> points;
if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points_3;
CGAL::IO::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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points_3;
for(Regular::Finite_vertices_iterator
vit = dt.finite_vertices_begin(),
@ -309,7 +300,6 @@ MainWindow::on_actionSavePoints_triggered()
vit->point().weight()));
}
CGAL::IO::write_multi_point_WKT(ofs, points_3);
#endif
}
else
{

5
Installation/CMakeLists.txt
View File

@ -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")

2
Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
View File

@ -18,7 +18,7 @@ int main() {
#endif
#if __has_feature(cxx_thread_local) || \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L )
( __GNUC__ > 0 && __cplusplus >= 201103L )
return 0;
#else
return 1;

121
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,78 +173,60 @@
// 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
#define CGAL_CFG_NO_TR1_ARRAY 1
// never use TR1
#define CGAL_CFG_NO_TR1_TUPLE 1
#if !defined(__GNUC__) || defined(__INTEL_COMPILER)
#if (__GNUC__ <= 0) || 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
# 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__)
#include <boost/predef.h>
#if BOOST_ENDIAN_BIG_BYTE
# 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
@ -550,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) || (CGAL_GCC_VERSION > 0 && !__STRICT_ANSI__)
// From g++ 4.5, there exists a __builtin_unreachable()
// Also in LLVM/clang
# define CGAL_ASSUME(EX) if(!(EX)) { __builtin_unreachable(); }
@ -570,22 +509,20 @@ using std::max;
#endif
#if __has_feature(cxx_thread_local) || \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
( (__GNUC__ > 0) && __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 ( BOOST_VERSION >= 105000 && ! defined(BOOST_NO_CXX11_HDR_MUTEX) ) || \
(__has_include(<mutex>) && __cplusplus >= 201103L ) | \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
#if (__has_include(<mutex>) && __cplusplus >= 201103L ) | \
( (__GNUC__ > 0) && __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 ) || \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
#if (__has_include(<atomic>) && __cplusplus >= 201103L ) || \
( (__GNUC__ > 0) && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_ATOMIC
#endif
@ -610,7 +547,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
@ -686,7 +623,6 @@ namespace cpp11{
}//namespace cpp11
} //namespace CGAL
// The fallthrough attribute
// See for clang:
// http://clang.llvm.org/docs/AttributeReference.html#statement-attributes
@ -704,9 +640,10 @@ namespace cpp11{
# 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
#ifndef CGAL_NO_ASSERTIONS
# define CGAL_NO_ASSERTIONS_BOOL false
#else
# define CGAL_NO_ASSERTIONS_BOOL true
#endif
#if defined( __INTEL_COMPILER)

2
Installation/include/CGAL/export/helpers.h
View File

@ -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")))

2
Installation/include/CGAL/internal/deprecation_warning.h
View File

@ -75,7 +75,7 @@ CGAL_static_assertion_msg(false, CGAL_INTERNAL_DEPRECATED_MESSAGE);
#elif !defined(CGAL_NO_DEPRECATION_WARNINGS) // don't trigger on NO_DEPRECATION_WARNINGS
# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
# pragma message (CGAL_INTERNAL_DEPRECATED_MESSAGE)
# elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
# elif (__GNUC__ > 0) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
// warning does not expand its arguments, issue a warning and add the message.
# warning "A deprecated header has been included."
# pragma message (CGAL_INTERNAL_DEPRECATED_MESSAGE)

4
Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h
View File

@ -19,7 +19,7 @@
#include <bitset>
#include <boost/config.hpp>
#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

4
Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
View File

@ -18,7 +18,7 @@
#include <bitset>
#include <boost/config.hpp>
#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 //

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)

2
NewKernel_d/include/CGAL/NewKernel_d/Vector/avx4.h
View File

@ -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 <x86intrin.h>

2
NewKernel_d/include/CGAL/NewKernel_d/Vector/sse2.h
View File

@ -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 <x86intrin.h> // FIXME: other platforms call it differently

11
NewKernel_d/test/NewKernel_d/Epick_d.cpp
View File

@ -1,13 +1,4 @@
#include <boost/config.hpp>
#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
#include <iostream>
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 <CGAL/Epick_d.h>
@ -768,5 +759,3 @@ int main(){
test4<CGAL::Epeck_d<CGAL::Dynamic_dimension_tag>>();
#endif
}
#endif

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

@ -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 (__GNUC__ > 0)
// 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);

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

4
Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h
View File

@ -17,7 +17,7 @@
#include <boost/config.hpp>
#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

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();

14
Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp
View File

@ -11,9 +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)
#include <CGAL/IO/WKT.h>
#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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! 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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
void MainWindow::loadWKT(QString fileName)
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
typedef std::vector<Point_2> MultiPoint;
typedef std::vector<Point_2> LineString;
@ -419,7 +408,6 @@ void MainWindow::loadWKT(QString
Q_EMIT( changed());
actionRecenter->trigger();
#endif
}

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

@ -9,9 +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)
#include <CGAL/IO/WKT.h>
#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 BOOST_VERSION >= 105600 && (! 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;
}

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

@ -1,7 +1,6 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream>
#include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -58,10 +57,3 @@ int main(int argc, char* argv[])
return 0;
}
#else
int main()
{
return 0;
}
#endif

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

@ -1,6 +1,5 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream>
#include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -30,9 +29,3 @@ int main(int argc, char* argv[])
return 0;
}
#else
int main()
{
return 0;
}
#endif

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

@ -1,7 +1,5 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream>
#include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -17,10 +15,8 @@ typedef K::Point_2 Point_2;
typedef std::deque<Point_2> Polyline_2;
typedef PS::Stop_above_cost_threshold Stop;
typedef PS::Squared_distance_cost Cost;
#endif
int main(int argc, char* argv[])
{
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
Polyline_2 polyline;
std::ifstream ifs( (argc==1)?"data/polyline.wkt":argv[1]);
CGAL::IO::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;
}

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)

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

@ -8,8 +8,6 @@
#include <fstream>
#include <vector>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;
@ -42,9 +40,3 @@ int main(int argc, char* argv[])
}
return 0;
}
#else
int main()
{
return 0;
}
#endif

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

@ -7,8 +7,6 @@
#include <iostream>
#include <fstream>
#include <vector>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;
@ -29,9 +27,3 @@ int main(int argc, char* argv[])
is.close();
return 0;
}
#else
int main()
{
return 0;
}
#endif

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

@ -9,8 +9,6 @@
#include <vector>
#include <deque>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;
@ -44,9 +42,3 @@ int main(int argc, char* argv[])
}
return 0;
}
#else
int main()
{
return 0;
}
#endif

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

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

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

@ -15,8 +15,6 @@
#ifndef CGAL_IO_WKT_H
#define CGAL_IO_WKT_H
#if defined(DOXYGEN_RUNNING) || (BOOST_VERSION >= 105600 && (!defined(BOOST_GCC) || BOOST_GCC >= 40500))
#include <CGAL/Point_2.h>
#include <CGAL/Point_3.h>
#include <CGAL/Polygon_2.h>
@ -595,6 +593,4 @@ using IO::write_polygon_WKT;
} // namespace CGAL
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_H

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

@ -15,8 +15,6 @@
#ifndef CGAL_IO_WKT_TRAITS_LINESTRING_H
#define CGAL_IO_WKT_TRAITS_LINESTRING_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp>
@ -36,5 +34,4 @@ struct tag<CGAL::internal::Geometry_container<R, linestring_tag> >
} // namespace geometry
} // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_LINESTRING_H

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

@ -15,8 +15,6 @@
#ifndef CGAL_IO_WKT_TRAITS_MULTILINESTRING_H
#define CGAL_IO_WKT_TRAITS_MULTILINESTRING_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp>
@ -37,5 +35,4 @@ struct tag<CGAL::internal::Geometry_container<R, multi_linestring_tag> >
} // namespace geometry
} // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_MULTILINESTRING_H

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

@ -15,8 +15,6 @@
#ifndef CGAL_IO_WKT_TRAITS_MULTIPOINT_H
#define CGAL_IO_WKT_TRAITS_MULTIPOINT_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp>
@ -36,6 +34,4 @@ struct tag<CGAL::internal::Geometry_container<R, multi_point_tag > >
} // namespace traits
} // namespace geometry
} // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_MULTIPOINT_H

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

@ -15,8 +15,6 @@
#ifndef CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H
#define CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp>
@ -37,6 +35,5 @@ struct tag<CGAL::internal::Geometry_container<R, multi_polygon_tag> >
} // namespace geometry
} // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H

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

@ -15,8 +15,6 @@
#ifndef CGAL_IO_WKT_TRAITS_POINT_H
#define CGAL_IO_WKT_TRAITS_POINT_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/number_utils.h>
#include <CGAL/Point_2.h>
@ -69,5 +67,4 @@ struct access<CGAL::Point_2<K>, 1>
} // namespace geometry
} // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_POINT_H

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

@ -15,8 +15,6 @@
#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)
#include <CGAL/number_utils.h>
#include <CGAL/Point_3.h>
@ -76,5 +74,4 @@ struct access<CGAL::Point_3<K>, 2>
} // namespace geometry
} // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_POINT_3_H

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

@ -15,8 +15,6 @@
#ifndef CGAL_IO_WKT_TRAITS_POLYGON_H
#define CGAL_IO_WKT_TRAITS_POLYGON_H
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/Polygon_2.h>
#include <CGAL/Polygon_with_holes_2.h>
#include <CGAL/Point_2.h>
@ -101,5 +99,4 @@ struct range_value<CGAL::Polygon_2<K> >
} // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_POLYGON_H

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

@ -14,7 +14,6 @@
#ifndef GEOMETRY_CONTAINER_H
#define GEOMETRY_CONTAINER_H
#if BOOST_VERSION >= 105600 && (! 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>
@ -118,4 +117,3 @@ struct range_mutable_iterator<CGAL::internal::Geometry_container<T, TAG> >
}//end boost
#endif // GEOMETRY_CONTAINER_H
#endif

1
Stream_support/package_info/Stream_support/dependencies
View File

@ -6,6 +6,7 @@ Interval_support
Kernel_23
Modular_arithmetic
Number_types
Polygon
Profiling_tools
Property_map
STL_Extension

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

@ -1,6 +1,5 @@
#include <iostream>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -120,14 +119,14 @@ Poly generate_polygon()
border.push_back(br);
Poly::Polygon_2 hole1;
hole1.emplace_back((xt+xmax)/2, (ymin+ymid)/2);
hole1.emplace_back((xt+xmax)/2, ymid);
hole1.emplace_back(xt+(xmax-xt)/4, (ymin+ymid)/2);
hole1.push_back(Point((xt+xmax)/2, (ymin+ymid)/2));
hole1.push_back(Point((xt+xmax)/2, ymid));
hole1.push_back(Point(xt+(xmax-xt)/4, (ymin+ymid)/2));
Poly::Polygon_2 hole2;
hole2.emplace_back((xt+xmin)/2, (ymin+ymid)/2);
hole2.emplace_back((xt+xmin)/2, ymid);
hole2.emplace_back(xmin+(xt-xmin)/4, (ymin+ymid)/2);
hole2.push_back(Point((xt+xmin)/2, (ymin+ymid)/2));
hole2.push_back(Point((xt+xmin)/2, ymid));
hole2.push_back(Point(xmin+(xt-xmin)/4, (ymin+ymid)/2));
Poly::Holes_container holes;
holes.push_back(hole1);
@ -279,9 +278,4 @@ int main()
return EXIT_SUCCESS;
}
#else
int main(int, char**)
{
return EXIT_SUCCESS;
}
#endif

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) {

11
Triangulation/examples/Triangulation/delaunay_triangulation.cpp
View File

@ -1,13 +1,4 @@
#include <CGAL/config.h>
#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
#include <iostream>
int main()
{
std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
}
#else
#include <CGAL/Epick_d.h>
#include <CGAL/Delaunay_triangulation.h>
@ -48,5 +39,3 @@ int main()
}
return 0;
}
#endif

9
Triangulation/examples/Triangulation/triangulation.cpp
View File

@ -1,12 +1,4 @@
#include <CGAL/config.h>
#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
#include <iostream>
int main()
{
std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
}
#else
#include <CGAL/Epick_d.h>
#include <CGAL/point_generators_d.h>
@ -50,4 +42,3 @@ int main()
return 0;
}
#endif

11
Triangulation/test/Triangulation/test_delaunay.cpp
View File

@ -1,13 +1,4 @@
#include <CGAL/config.h>
#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
#include <iostream>
int main()
{
std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
}
#else
#include <CGAL/Epick_d.h>
#include <CGAL/Epeck_d.h>
@ -145,5 +136,3 @@ int main(int argc, char **argv)
cerr << endl;
return 0;
}
#endif

10
Triangulation/test/Triangulation/test_torture.cpp
View File

@ -1,13 +1,4 @@
#include <CGAL/config.h>
#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
#include <iostream>
int main()
{
std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
}
#else
#include <CGAL/Epick_d.h>
#include <CGAL/internal/Combination_enumerator.h>
@ -152,4 +143,3 @@ int main(int argc, char **argv)
return 0;
}
#endif

10
Triangulation/test/Triangulation/test_triangulation.cpp
View File

@ -1,12 +1,4 @@
#include <CGAL/config.h>
#if defined(BOOST_GCC) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4)
#include <iostream>
int main()
{
std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl;
}
#else
#include <CGAL/Epick_d.h>
#include <CGAL/point_generators_d.h>
#include <CGAL/Triangulation.h>
@ -166,5 +158,3 @@ int main(int argc, char **argv)
cerr << std::endl;
return 0;
}
#endif

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;