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

Simplify the GNUC versions tests

This commit is contained in:
Maxime Gimeno 2021-05-12 15:45:07 +02:00
parent 393ae7dae6
commit e6c767d5c9
68 changed files with 35 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,20 +44,12 @@ public:
using Base::f; using Base::f;
protected: 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()
{ {
static const FT offset_(10000); static const FT offset_(10000);
return offset_; return offset_;
} }
#endif
template< class Stream > template< class Stream >
inline inline

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

@ -124,13 +124,8 @@ public:
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif defined(__GNUC__)
#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>::Around_point_circulator;
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else #else
friend class Around_point_circulator; friend class Around_point_circulator;

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -93,13 +93,7 @@ public:
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif defined(__GNUC__)
#if ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)))
friend typename Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#endif
#else #else
friend class In_face_iterator; friend class In_face_iterator;
#endif #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 #define CGAL_TD_DEFAULT_SIZE_THRESHOLD 12
#ifndef _MSC_VER #ifndef _MSC_VER
#if !defined __GNUC__ || __GNUC__> 3 || ((__GNUC__== 3) && (__GNUC_MINOR__> 4))
#define CGAL_PM_FRIEND_CLASS #define CGAL_PM_FRIEND_CLASS
#endif #endif
#endif
#endif #endif

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

@ -25,7 +25,7 @@
#include <boost/parameter/name.hpp> #include <boost/parameter/name.hpp>
#if defined(__clang__) || (BOOST_GCC >= 40600) #if defined(__clang__) || defined(BOOST_GCC)
# define CGAL_IGNORE_UNUSED_VARIABLES \ # define CGAL_IGNORE_UNUSED_VARIABLES \
_Pragma("GCC diagnostic ignored \"-Wunused-variable\"") \ _Pragma("GCC diagnostic ignored \"-Wunused-variable\"") \
_Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") _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 /* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */ not overlap. */
# ifndef YYCOPY # ifndef YYCOPY
# if defined (__GNUC__) && 1 < __GNUC__ # if defined (__GNUC__)
# define YYCOPY(To, From, Count) \ # define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From))) __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else # else

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

@ -55,7 +55,7 @@
#endif #endif
#include <boost/config.hpp> #include <boost/config.hpp>
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Warray-bounds\"") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"")
#endif #endif
@ -4824,7 +4824,7 @@ namespace CGAL {
} // namespace CGAL } // namespace CGAL
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic pop") _Pragma("GCC diagnostic pop")
#endif #endif

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

@ -19,7 +19,7 @@
#include <bitset> #include <bitset>
#include <boost/config.hpp> #include <boost/config.hpp>
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Warray-bounds\"") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"")
#endif #endif
@ -439,7 +439,7 @@ namespace CGAL {
} // namespace CGAL } // namespace CGAL
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic pop") _Pragma("GCC diagnostic pop")
#endif #endif

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

@ -42,7 +42,7 @@
#endif #endif
#include <boost/config.hpp> #include <boost/config.hpp>
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Warray-bounds\"") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"")
#endif #endif
@ -3890,7 +3890,7 @@ namespace CGAL {
} // namespace CGAL } // namespace CGAL
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic pop") _Pragma("GCC diagnostic pop")
#endif #endif

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

@ -19,7 +19,7 @@
#include <bitset> #include <bitset>
#include <boost/config.hpp> #include <boost/config.hpp>
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Warray-bounds\"") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"")
#endif #endif
@ -426,7 +426,7 @@ namespace CGAL {
} // namespace CGAL } // namespace CGAL
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic pop") _Pragma("GCC diagnostic pop")
#endif #endif
#endif // CGAL_GENERALIZED_MAP_STORAGES_H // #endif // CGAL_GENERALIZED_MAP_STORAGES_H //

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_2.h>
#include <CGAL/Alpha_shape_face_base_2.h> #include <CGAL/Alpha_shape_face_base_2.h>
#include <CGAL/Alpha_shape_vertex_base_2.h> #include <CGAL/Alpha_shape_vertex_base_2.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
#include <CGAL/point_generators_2.h> #include <CGAL/point_generators_2.h>
// Qt headers // Qt headers
@ -253,9 +251,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wktk *.WKT);;" "WKT files (*.wktk *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -274,9 +270,7 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName)); std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points); CGAL::read_multi_point_WKT(ifs, points);
#endif
} }
else 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_hierarchy_2.h>
#include <CGAL/Apollonius_graph_filtered_traits_2.h> #include <CGAL/Apollonius_graph_filtered_traits_2.h>
#include <CGAL/point_generators_2.h> #include <CGAL/point_generators_2.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
#include <boost/random/uniform_real.hpp> #include <boost/random/uniform_real.hpp>
@ -220,9 +218,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("CGAL files (*.wpts.cgal);;" tr("CGAL files (*.wpts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -241,14 +237,12 @@ MainWindow::open(QString fileName)
std::vector<Apollonius_site_2> points; std::vector<Apollonius_site_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> point_3_s; std::vector<K::Point_3> point_3_s;
CGAL::read_multi_point_WKT(ifs, point_3_s); CGAL::read_multi_point_WKT(ifs, point_3_s);
for(const K::Point_3& point_3 : 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())); points.push_back(Apollonius_site_2(K::Point_2(point_3.x(), point_3.y()), point_3.z()));
} }
#endif
} else{ } else{
K::Weighted_point_2 p; K::Weighted_point_2 p;
while(ifs >> p) { while(ifs >> p) {
@ -270,15 +264,12 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"), tr("Save points"),
".reg.cgal", ".reg.cgal",
tr("Weighted Points (*.wpts.cgal);;" tr("Weighted Points (*.wpts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files(*.wkt *.WKT);;" "WKT files(*.wkt *.WKT);;"
#endif
"All (*)")); "All (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points; std::vector<K::Point_3> points;
for(Apollonius::Sites_iterator for(Apollonius::Sites_iterator
vit = ag.sites_begin(), vit = ag.sites_begin(),
@ -290,7 +281,6 @@ MainWindow::on_actionSavePoints_triggered()
vit->weight())); vit->weight()));
} }
CGAL::write_multi_point_WKT(ofs, points); CGAL::write_multi_point_WKT(ofs, points);
#endif
} }
else else
for(Apollonius::Sites_iterator 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/Polygon_2.h>
#include <CGAL/min_quadrilateral_2.h> #include <CGAL/min_quadrilateral_2.h>
#include <CGAL/rectangular_p_center_2.h> #include <CGAL/rectangular_p_center_2.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// Qt headers // Qt headers
#include <QtGui> #include <QtGui>
@ -479,9 +477,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;" "WKT files (*.WKT *.wkt);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -497,14 +493,12 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName)); std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points); CGAL::read_multi_point_WKT(ifs, points);
for(K::Point_2 p : points) for(K::Point_2 p : points)
{ {
mc.insert(p); mc.insert(p);
me.insert(p); me.insert(p);
} }
#endif
} }
else else
{ {
@ -532,15 +526,12 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"), tr("Save points"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;" "WKT files (*.WKT *.wkt);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_2> out_pts; std::vector<K::Point_2> out_pts;
out_pts.reserve(std::distance(mc.points_begin(), out_pts.reserve(std::distance(mc.points_begin(),
mc.points_end())); mc.points_end()));
@ -548,7 +539,6 @@ MainWindow::on_actionSavePoints_triggered()
pit != mc.points_end(); ++pit) pit != mc.points_end(); ++pit)
out_pts.push_back(*pit); out_pts.push_back(*pit);
CGAL::write_multi_point_WKT(ofs, out_pts); CGAL::write_multi_point_WKT(ofs, out_pts);
#endif
} }
else else
{ {

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

@ -10,9 +10,7 @@
#include <CGAL/intersections.h> #include <CGAL/intersections.h>
#include <CGAL/Circular_kernel_2.h> #include <CGAL/Circular_kernel_2.h>
#include <CGAL/Object.h> #include <CGAL/Object.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// Qt headers // Qt headers
#include <QtGui> #include <QtGui>
@ -216,9 +214,7 @@ MainWindow::on_actionLoadLineAndCircularArcs_triggered()
tr("Open Line and Circular Arc File"), tr("Open Line and Circular Arc File"),
".", ".",
tr("Edge files (*.arc)\n" tr("Edge files (*.arc)\n"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT)\n" "WKT files (*.wkt *.WKT)\n"
#endif
)); ));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -236,7 +232,6 @@ MainWindow::open(QString fileName)
double x,y; double x,y;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
//read pairs as Line_arc_2 and triplets as circular_arc_2 //read pairs as Line_arc_2 and triplets as circular_arc_2
do do
{ {
@ -279,7 +274,6 @@ MainWindow::open(QString fileName)
} }
}while(ifs.good() && !ifs.eof()); }while(ifs.good() && !ifs.eof());
ifs.close(); ifs.close();
#endif
} }
else else
{ {

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

@ -24,9 +24,7 @@
#include <QInputDialog> #include <QInputDialog>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
#include <fstream> #include <fstream>
@ -275,9 +273,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -295,9 +291,7 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName)); std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, m_sites); CGAL::read_multi_point_WKT(ifs, m_sites);
#endif
} }
else else
{ {
@ -322,16 +316,12 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"), tr("Save points"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()) { if(! fileName.isEmpty()) {
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::write_multi_point_WKT(ofs, m_sites); CGAL::write_multi_point_WKT(ofs, m_sites);
#endif
}else }else
for(Points::iterator it = m_sites.begin(); for(Points::iterator it = m_sites.begin();
it != m_sites.end(); ++it) 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_2.h>
#include <CGAL/Periodic_2_Delaunay_triangulation_traits_2.h> #include <CGAL/Periodic_2_Delaunay_triangulation_traits_2.h>
#include <CGAL/point_generators_2.h> #include <CGAL/point_generators_2.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// Qt headers // Qt headers
#include <QtGui> #include <QtGui>
@ -355,9 +353,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -376,9 +372,7 @@ MainWindow::open(QString fileName)
std::vector<Point_2> points; std::vector<Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points); CGAL::read_multi_point_WKT(ifs, points);
#endif
} }
else else
{ {
@ -404,15 +398,12 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"), tr("Save points"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<Point_2> points; std::vector<Point_2> points;
points.reserve(std::distance(triang.unique_vertices_begin(), points.reserve(std::distance(triang.unique_vertices_begin(),
triang.unique_vertices_end())); triang.unique_vertices_end()));
@ -424,7 +415,6 @@ MainWindow::on_actionSavePoints_triggered()
points.push_back(vit->point()); points.push_back(vit->point());
} }
CGAL::write_multi_point_WKT(ofs, points); CGAL::write_multi_point_WKT(ofs, points);
#endif
} }
else else
{ {

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

@ -13,9 +13,7 @@
#include <CGAL/minkowski_sum_2.h> #include <CGAL/minkowski_sum_2.h>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// Qt headers // Qt headers
#include <QtGui> #include <QtGui>
@ -234,9 +232,7 @@ MainWindow::on_actionLoadPolygon_triggered()
".", ".",
tr( "Polyline files (*.polygons.cgal);;" tr( "Polyline files (*.polygons.cgal);;"
"WSL files (*.wsl);;" "WSL files (*.wsl);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All file (*)")); "All file (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -251,12 +247,10 @@ MainWindow::open(QString fileName)
poly.clear(); poly.clear();
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::Polygon_with_holes_2<K> P; CGAL::Polygon_with_holes_2<K> P;
CGAL::read_polygon_WKT(ifs, P); CGAL::read_polygon_WKT(ifs, P);
poly = Polygon2(P.outer_boundary().begin(), poly = Polygon2(P.outer_boundary().begin(),
P.outer_boundary().end()); P.outer_boundary().end());
#endif
} }
else else
{ {
@ -276,20 +270,16 @@ MainWindow::on_actionSavePolygon_triggered()
tr("Save Polygon"), tr("Save Polygon"),
".", ".",
tr( "Polyline files (*.polygons.cgal);;" tr( "Polyline files (*.polygons.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All file (*)")); "All file (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::Polygon_2<K> P(poly.begin(), CGAL::Polygon_2<K> P(poly.begin(),
poly.end()); poly.end());
CGAL::Polygon_with_holes_2<K> Pwh(P); CGAL::Polygon_with_holes_2<K> Pwh(P);
CGAL::write_polygon_WKT(ofs, Pwh); CGAL::write_polygon_WKT(ofs, Pwh);
#endif
} }
else else
ofs << poly; 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/GraphicsViewPolylineInput.h>
#include <CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h> #include <CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h>
#include <CGAL/Constraints_loader.h> #include <CGAL/Constraints_loader.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
//#include <CGAL/Qt/Converter.h> //#include <CGAL/Qt/Converter.h>
// the two base classes // the two base classes
@ -248,10 +246,8 @@ MainWindow::open(QString fileName)
loadEdgConstraints(fileName); loadEdgConstraints(fileName);
this->addToRecentFiles(fileName); this->addToRecentFiles(fileName);
} else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ } else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKTConstraints(fileName); loadWKTConstraints(fileName);
this->addToRecentFiles(fileName); this->addToRecentFiles(fileName);
#endif
} }
} }
} }
@ -264,9 +260,7 @@ MainWindow::on_actionLoadSegments_triggered()
".", ".",
tr("Edge files (*.edg);;" tr("Edge files (*.edg);;"
"Polyline files (*.polygons.cgal);;" "Polyline files (*.polygons.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT)" "WKT files (*.wkt *.WKT)"
#endif
)); ));
open(fileName); open(fileName);
} }
@ -342,12 +336,10 @@ MainWindow::loadEdgConstraints(QString fileName)
void void
MainWindow::loadWKTConstraints(QString MainWindow::loadWKTConstraints(QString
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName fileName
#endif
) )
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
typedef CGAL::Polygon_with_holes_2<K> Polygon; typedef CGAL::Polygon_with_holes_2<K> Polygon;
typedef std::vector<K::Point_2> LineString; typedef std::vector<K::Point_2> LineString;
@ -414,7 +406,6 @@ MainWindow::loadWKTConstraints(QString
}while(ifs.good() && !ifs.eof()); }while(ifs.good() && !ifs.eof());
Q_EMIT( changed()); Q_EMIT( changed());
actionRecenter->trigger(); actionRecenter->trigger();
#endif
} }
void 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/GraphicsViewPolylineInput.h>
#include <CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h> #include <CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h>
#include <CGAL/Constraints_loader.h> #include <CGAL/Constraints_loader.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
//#include <CGAL/Qt/Converter.h> //#include <CGAL/Qt/Converter.h>
// the two base classes // the two base classes
@ -270,10 +268,8 @@ MainWindow::open(QString fileName)
loadSitesInput(fileName); loadSitesInput(fileName);
this->addToRecentFiles(fileName); this->addToRecentFiles(fileName);
} else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){ } else if(fileName.endsWith(".wkt", Qt::CaseInsensitive)){
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKT(fileName); loadWKT(fileName);
this->addToRecentFiles(fileName); this->addToRecentFiles(fileName);
#endif
} }
} }
} }
@ -291,9 +287,7 @@ MainWindow::on_actionLoadSegments_triggered()
"Pts files (*.pts);;" "Pts files (*.pts);;"
"Edge files (*.edg);;" "Edge files (*.edg);;"
"Polylines files (*.polygons.cgal);;" "Polylines files (*.polygons.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt)" "WKT files (*.WKT *.wkt)"
#endif
)); ));
open(fileName); open(fileName);
} }
@ -388,13 +382,8 @@ MainWindow::loadPoints(QString fileName)
} }
void void
MainWindow::loadWKT(QString MainWindow::loadWKT(QString fileName )
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::ifstream ifs(qPrintable(fileName)); std::ifstream ifs(qPrintable(fileName));
//Points //Points
do do
@ -479,7 +468,6 @@ MainWindow::loadWKT(QString
Q_EMIT( changed()); Q_EMIT( changed());
actionRecenter->trigger(); actionRecenter->trigger();
#endif
} }
void 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/SegmentsGraphicsItem.h>
#include <CGAL/Qt/PolylinesGraphicsItem.h> #include <CGAL/Qt/PolylinesGraphicsItem.h>
#include <CGAL/Qt/GraphicsViewPolylineInput.h> #include <CGAL/Qt/GraphicsViewPolylineInput.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// for viewportsBbox // for viewportsBbox
#include <CGAL/Qt/utility.h> #include <CGAL/Qt/utility.h>
@ -252,9 +250,7 @@ MainWindow::on_actionLoadSegments_triggered()
tr("Open segment file"), tr("Open segment file"),
".", ".",
tr("Edge files (*.edg);;" tr("Edge files (*.edg);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -270,7 +266,6 @@ MainWindow::open(QString fileName)
std::ifstream ifs(qPrintable(fileName)); std::ifstream ifs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> > mls; std::vector<std::vector<Point_2> > mls;
CGAL::read_multi_linestring_WKT(ifs, mls); CGAL::read_multi_linestring_WKT(ifs, mls);
for(const std::vector<Point_2>& ls : mls) for(const std::vector<Point_2>& ls : mls)
@ -280,7 +275,6 @@ MainWindow::open(QString fileName)
Segment_2 seg(ls[0], ls[1]); Segment_2 seg(ls[0], ls[1]);
input.push_back(seg); input.push_back(seg);
} }
#endif
} }
else { else {
std::copy(std::istream_iterator<Segment_2>(ifs), std::copy(std::istream_iterator<Segment_2>(ifs),
@ -304,16 +298,13 @@ MainWindow::on_actionSaveSegments_triggered()
tr("Save points"), tr("Save points"),
".", ".",
tr("Edge files (*.edg);;" tr("Edge files (*.edg);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
ofs.precision(12); ofs.precision(12);
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> >mls; std::vector<std::vector<Point_2> >mls;
for(const Segment_2& seg : input) for(const Segment_2& seg : input)
{ {
@ -323,7 +314,6 @@ MainWindow::on_actionSaveSegments_triggered()
mls.push_back(ls); mls.push_back(ls);
} }
CGAL::write_multi_linestring_WKT(ofs, mls); CGAL::write_multi_linestring_WKT(ofs, mls);
#endif
} }
else else
std::copy(input.begin(), input.end(), std::ostream_iterator<Segment_2>(ofs, "\n")); 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) // GraphicsView items and event filters (input classes)
#include <CGAL/Qt/PointsInKdTreeGraphicsItem.h> #include <CGAL/Qt/PointsInKdTreeGraphicsItem.h>
#include <CGAL/Qt/utility.h> #include <CGAL/Qt/utility.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// the two base classes // the two base classes
#include "ui_Spatial_searching_2.h" #include "ui_Spatial_searching_2.h"
@ -249,9 +247,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -271,9 +267,7 @@ MainWindow::open(QString fileName)
std::vector<K::Point_2> points; std::vector<K::Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points); CGAL::read_multi_point_WKT(ifs, points);
#endif
} }
else{ else{
while(ifs >> p) { while(ifs >> p) {

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

@ -21,9 +21,7 @@
// for viewportsBbox // for viewportsBbox
#include <CGAL/Qt/utility.h> #include <CGAL/Qt/utility.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// the two base classes // the two base classes
#include "ui_Stream_lines_2.h" #include "ui_Stream_lines_2.h"
#include <CGAL/Qt/DemosMainWindow.h> #include <CGAL/Qt/DemosMainWindow.h>
@ -167,14 +165,10 @@ MainWindow::generate()
void void
MainWindow::on_actionLoadPoints_triggered() MainWindow::on_actionLoadPoints_triggered()
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#endif
QString fileName = QFileDialog::getOpenFileName(this, QString fileName = QFileDialog::getOpenFileName(this,
tr("Open grid file"), tr("Open grid file"),
"." "."
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
,tr("WKT files (*.wkt *.WKT)") ,tr("WKT files (*.wkt *.WKT)")
#endif
); );
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -194,7 +188,6 @@ MainWindow::open(QString fileName)
iXSize = iYSize = 512; iXSize = iYSize = 512;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<std::vector<Point_2> > mp; std::vector<std::vector<Point_2> > mp;
int size= -1; int size= -1;
do do
@ -216,10 +209,6 @@ MainWindow::open(QString fileName)
{ {
regular_grid->set_field(i, j, Vector(mp[j][i].x(), mp[j][i].y())); regular_grid->set_field(i, j, Vector(mp[j][i].x(), mp[j][i].y()));
} }
#else
QApplication::restoreOverrideCursor();
return;
#endif
} }
else{ else{
unsigned int x_samples, y_samples; unsigned int x_samples, y_samples;
@ -248,7 +237,6 @@ MainWindow::open(QString fileName)
void void
MainWindow::on_actionSavePoints_triggered() MainWindow::on_actionSavePoints_triggered()
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
QString fileName = QFileDialog::getSaveFileName(this, QString fileName = QFileDialog::getSaveFileName(this,
tr("Save points"), tr("Save points"),
".", ".",
@ -270,7 +258,6 @@ MainWindow::on_actionSavePoints_triggered()
} }
ofs.close(); 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/point_generators_2.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#include <CGAL/IO/write_vtu.h> #include <CGAL/IO/write_vtu.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// Qt headers // Qt headers
#include <QtGui> #include <QtGui>
@ -528,9 +526,7 @@ MainWindow::open(QString fileName)
} else if(fileName.endsWith(".poly")){ } else if(fileName.endsWith(".poly")){
loadPolyConstraints(fileName); loadPolyConstraints(fileName);
} else if(fileName.endsWith(".wkt")){ } else if(fileName.endsWith(".wkt")){
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKT(fileName); loadWKT(fileName);
#endif
} }
this->addToRecentFiles(fileName); this->addToRecentFiles(fileName);
} }
@ -549,21 +545,14 @@ MainWindow::on_actionLoadConstraints_triggered()
"Poly files (*.poly);;" "Poly files (*.poly);;"
"Plg files (*.plg);;" "Plg files (*.plg);;"
"CGAL files (*.cpts.cgal);;" "CGAL files (*.cpts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;" "WKT files (*.WKT *.wkt);;"
#endif
"All (*)")); "All (*)"));
open(fileName); open(fileName);
} }
void void
MainWindow::loadWKT(QString MainWindow::loadWKT(QString filename)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
filename
#endif
)
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
//Polygons todo : make it multipolygons //Polygons todo : make it multipolygons
std::ifstream ifs(qPrintable(filename)); std::ifstream ifs(qPrintable(filename));
do do
@ -651,7 +640,6 @@ MainWindow::loadWKT(QString
discoverComponents(cdt, m_seeds); discoverComponents(cdt, m_seeds);
Q_EMIT( changed()); Q_EMIT( changed());
actionRecenter->trigger(); actionRecenter->trigger();
#endif
} }
void void

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

@ -23,9 +23,7 @@
#include "TriangulationPointInputAndConflictZone.h" #include "TriangulationPointInputAndConflictZone.h"
#include <CGAL/Qt/TriangulationGraphicsItem.h> #include <CGAL/Qt/TriangulationGraphicsItem.h>
#include <CGAL/Qt/VoronoiGraphicsItem.h> #include <CGAL/Qt/VoronoiGraphicsItem.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
// for viewportsBbox // for viewportsBbox
#include <CGAL/Qt/utility.h> #include <CGAL/Qt/utility.h>
@ -322,9 +320,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;" "WKT files (*.WKT *.wkt);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
open(fileName); open(fileName);
@ -343,9 +339,7 @@ MainWindow::open(QString fileName)
std::vector<K::Point_2> points; std::vector<K::Point_2> points;
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
CGAL::read_multi_point_WKT(ifs, points); CGAL::read_multi_point_WKT(ifs, points);
#endif
} }
else else
while(ifs >> p) { while(ifs >> p) {
@ -370,15 +364,12 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"), tr("Save points"),
".", ".",
tr("CGAL files (*.pts.cgal);;" tr("CGAL files (*.pts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.WKT *.wkt);;" "WKT files (*.WKT *.wkt);;"
#endif
"All files (*)")); "All files (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt", Qt::CaseInsensitive)) if(fileName.endsWith(".wkt", Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_2> points; std::vector<K::Point_2> points;
points.reserve(dt.number_of_vertices()); points.reserve(dt.number_of_vertices());
for(Delaunay::Finite_vertices_iterator for(Delaunay::Finite_vertices_iterator
@ -389,7 +380,6 @@ MainWindow::on_actionSavePoints_triggered()
points.push_back(vit->point()); points.push_back(vit->point());
} }
CGAL::write_multi_point_WKT(ofs, points); CGAL::write_multi_point_WKT(ofs, points);
#endif
} }
else else
for(Delaunay::Finite_vertices_iterator for(Delaunay::Finite_vertices_iterator

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

@ -5,9 +5,7 @@
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Regular_triangulation_2.h> #include <CGAL/Regular_triangulation_2.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
#include <CGAL/point_generators_2.h> #include <CGAL/point_generators_2.h>
// Qt headers // Qt headers
@ -248,9 +246,7 @@ MainWindow::on_actionLoadPoints_triggered()
tr("Open Points file"), tr("Open Points file"),
".", ".",
tr("Weighted Points (*.wpts.cgal);;" tr("Weighted Points (*.wpts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All (*)")); "All (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
@ -258,14 +254,12 @@ MainWindow::on_actionLoadPoints_triggered()
std::vector<Weighted_point_2> points; std::vector<Weighted_point_2> points;
if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points_3; std::vector<K::Point_3> points_3;
CGAL::read_multi_point_WKT(ifs, points_3); CGAL::read_multi_point_WKT(ifs, points_3);
for(const K::Point_3& p : 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())); points.push_back(Weighted_point_2(K::Point_2(p.x(), p.y()), p.z()));
} }
#endif
} }
else else
{ {
@ -289,15 +283,12 @@ MainWindow::on_actionSavePoints_triggered()
tr("Save points"), tr("Save points"),
".reg.cgal", ".reg.cgal",
tr("Weighted Points (*.wpts.cgal);;" tr("Weighted Points (*.wpts.cgal);;"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
"WKT files (*.wkt *.WKT);;" "WKT files (*.wkt *.WKT);;"
#endif
"All (*)")); "All (*)"));
if(! fileName.isEmpty()){ if(! fileName.isEmpty()){
std::ofstream ofs(qPrintable(fileName)); std::ofstream ofs(qPrintable(fileName));
if(fileName.endsWith(".wkt",Qt::CaseInsensitive)) if(fileName.endsWith(".wkt",Qt::CaseInsensitive))
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::vector<K::Point_3> points_3; std::vector<K::Point_3> points_3;
for(Regular::Finite_vertices_iterator for(Regular::Finite_vertices_iterator
vit = dt.finite_vertices_begin(), vit = dt.finite_vertices_begin(),
@ -309,7 +300,6 @@ MainWindow::on_actionSavePoints_triggered()
vit->point().weight())); vit->point().weight()));
} }
CGAL::write_multi_point_WKT(ofs, points_3); CGAL::write_multi_point_WKT(ofs, points_3);
#endif
} }
else else
{ {

5
Installation/CMakeLists.txt
View File

@ -469,11 +469,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
uniquely_add_flags(CGAL_CXX_FLAGS "-frounding-math") uniquely_add_flags(CGAL_CXX_FLAGS "-frounding-math")
endif() 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") if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "alpha")
message(STATUS "Using gcc on alpha. Adding -mieee -mfp-rounding-mode=d") message(STATUS "Using gcc on alpha. Adding -mieee -mfp-rounding-mode=d")
uniquely_add_flags(CGAL_CXX_FLAGS "-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 #endif
#if __has_feature(cxx_thread_local) || \ #if __has_feature(cxx_thread_local) || \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) ( defined(__GNUC__) && __cplusplus >= 201103L )
return 0; return 0;
#else #else
return 1; return 1;

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

@ -489,7 +489,7 @@ using std::max;
// Macro CGAL_ASSUME // Macro CGAL_ASSUME
// Call a builtin of the compiler to pass a hint to the compiler // Call a builtin of the compiler to pass a hint to the compiler
#if __has_builtin(__builtin_unreachable) || (CGAL_GCC_VERSION >= 40500 && !__STRICT_ANSI__) #if __has_builtin(__builtin_unreachable) || (!__STRICT_ANSI__)
// From g++ 4.5, there exists a __builtin_unreachable() // From g++ 4.5, there exists a __builtin_unreachable()
// Also in LLVM/clang // Also in LLVM/clang
# define CGAL_ASSUME(EX) if(!(EX)) { __builtin_unreachable(); } # define CGAL_ASSUME(EX) if(!(EX)) { __builtin_unreachable(); }
@ -509,20 +509,20 @@ using std::max;
#endif #endif
#if __has_feature(cxx_thread_local) || \ #if __has_feature(cxx_thread_local) || \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \ ( defined(__GNUC__) && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1900 ) ( _MSC_VER >= 1900 )
// see also Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp // see also Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
#define CGAL_CAN_USE_CXX11_THREAD_LOCAL #define CGAL_CAN_USE_CXX11_THREAD_LOCAL
#endif #endif
#if (__has_include(<mutex>) && __cplusplus >= 201103L ) | \ #if (__has_include(<mutex>) && __cplusplus >= 201103L ) | \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \ ( defined(__GNUC__) && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1700 ) ( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_MUTEX #define CGAL_CAN_USE_CXX11_MUTEX
#endif #endif
#if (__has_include(<atomic>) && __cplusplus >= 201103L ) || \ #if (__has_include(<atomic>) && __cplusplus >= 201103L ) || \
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \ ( defined(__GNUC__) && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1700 ) ( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_ATOMIC #define CGAL_CAN_USE_CXX11_ATOMIC
#endif #endif
@ -537,7 +537,7 @@ using std::max;
#define LEDA_NUMBERS_DLL 1 #define LEDA_NUMBERS_DLL 1
// Helper macros to disable macros // 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_PUSH _Pragma("GCC diagnostic push")
# define CGAL_PRAGMA_DIAG_POP _Pragma("GCC diagnostic pop") # define CGAL_PRAGMA_DIAG_POP _Pragma("GCC diagnostic pop")
#else #else

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

@ -23,7 +23,7 @@
# define CGAL_DLL_EXPORT __declspec(dllexport) # define CGAL_DLL_EXPORT __declspec(dllexport)
# define CGAL_DLL_LOCAL # define CGAL_DLL_LOCAL
# else # else
#if __GNUC__ >= 4 #ifdef __GNUC__
#define CGAL_DLL_IMPORT __attribute__ ((visibility ("default"))) #define CGAL_DLL_IMPORT __attribute__ ((visibility ("default")))
#define CGAL_DLL_EXPORT __attribute__ ((visibility ("default"))) #define CGAL_DLL_EXPORT __attribute__ ((visibility ("default")))
#define CGAL_DLL_LOCAL __attribute__ ((visibility ("hidden"))) #define CGAL_DLL_LOCAL __attribute__ ((visibility ("hidden")))

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

@ -19,7 +19,7 @@
#include <bitset> #include <bitset>
#include <boost/config.hpp> #include <boost/config.hpp>
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Warray-bounds\"") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"")
#endif #endif
@ -476,7 +476,7 @@ namespace CGAL {
} // namespace CGAL } // namespace CGAL
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic pop") _Pragma("GCC diagnostic pop")
#endif #endif

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

@ -18,7 +18,7 @@
#include <bitset> #include <bitset>
#include <boost/config.hpp> #include <boost/config.hpp>
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Warray-bounds\"") _Pragma("GCC diagnostic ignored \"-Warray-bounds\"")
#endif #endif
@ -460,7 +460,7 @@ namespace CGAL {
Items_, Alloc_, Concurrent_tag>::null_handle = nullptr; Items_, Alloc_, Concurrent_tag>::null_handle = nullptr;
} // namespace CGAL } // namespace CGAL
#if (BOOST_GCC >= 40900) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic pop") _Pragma("GCC diagnostic pop")
#endif #endif
#endif // CGAL_GMAP_LINEAR_CELL_COMPLEX_STORAGES_H // #endif // CGAL_GMAP_LINEAR_CELL_COMPLEX_STORAGES_H //

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

@ -12,7 +12,7 @@
#ifndef CGAL_VECTOR_AVX4_H #ifndef CGAL_VECTOR_AVX4_H
#define 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+ #error Requires AVX and gcc 4.8+
#endif #endif
#include <x86intrin.h> #include <x86intrin.h>

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

@ -13,7 +13,7 @@
#define CGAL_VECTOR_SSE2_H #define CGAL_VECTOR_SSE2_H
// Check what needs adapting for clang, intel and microsoft // 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+ #error Requires SSE2 and gcc 4.8+
#endif #endif
#include <x86intrin.h> // FIXME: other platforms call it differently #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> #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 //#define BOOST_RESULT_OF_USE_DECLTYPE 1
#include <CGAL/Epick_d.h> #include <CGAL/Epick_d.h>
@ -768,5 +759,3 @@ int main(){
test4<CGAL::Epeck_d<CGAL::Dynamic_dimension_tag>>(); test4<CGAL::Epeck_d<CGAL::Dynamic_dimension_tag>>();
#endif #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__ // Intel has a bug where -mno-sse still defines __SSE__ and __SSE2__
// (-mno-sse2 works though), no work-around for now. // (-mno-sse2 works though), no work-around for now.
# if defined __SSE2_MATH__ || (defined __INTEL_COMPILER && defined __SSE2__) # if defined __SSE2_MATH__ || (defined __INTEL_COMPILER && defined __SSE2__)
# if __GNUC__ * 100 + __GNUC_MINOR__ >= 409 # if defined(__GNUC__)
// ICEs in reload/LRA with older versions. // ICEs in reload/LRA with older versions.
asm volatile ("" : "+gx"(x) ); asm volatile ("" : "+gx"(x) );
# else # else
@ -275,8 +275,7 @@ inline __m128d IA_opacify128_weak(__m128d x)
inline __m128d swap_m128d(__m128d x){ inline __m128d swap_m128d(__m128d x){
# ifdef __llvm__ # ifdef __llvm__
return __builtin_shufflevector(x, x, 1, 0); return __builtin_shufflevector(x, x, 1, 0);
# elif defined __GNUC__ && !defined __INTEL_COMPILER \ # elif defined __GNUC__ && !defined __INTEL_COMPILER
&& __GNUC__ * 100 + __GNUC_MINOR__ >= 407
return __builtin_shuffle(x, (__m128i){ 1, 0 }); return __builtin_shuffle(x, (__m128i){ 1, 0 });
# else # else
return _mm_shuffle_pd(x, x, 1); return _mm_shuffle_pd(x, x, 1);

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

@ -17,7 +17,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#if (BOOST_GCC >= 40800) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
#endif #endif
@ -264,7 +264,7 @@ OutputIterator partition_approx_convex_2(InputIterator first,
} }
} }
#if (BOOST_GCC >= 40800) #if defined(BOOST_GCC)
_Pragma("GCC diagnostic pop") _Pragma("GCC diagnostic pop")
#endif #endif
#endif // CGAL_PARTITION_APPROX_CONVEX_H #endif // CGAL_PARTITION_APPROX_CONVEX_H

2
Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_regular_triangulation_traits_3.h
View File

@ -10,7 +10,7 @@
// Author(s) : Aymeric PELLE <aymeric.pelle@sophia.inria.fr> // Author(s) : Aymeric PELLE <aymeric.pelle@sophia.inria.fr>
// Mael Rouxel-Labbé // Mael Rouxel-Labbé
#if (__GNUC__>4) || (__GNUC__ == 4 && __GNUC_MINOR__ >=6) #if defined(__GNUC__)
# pragma GCC diagnostic ignored "-Wunused-but-set-variable" # pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif #endif

2
Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_traits_3.h
View File

@ -11,7 +11,7 @@
// Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr> // Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr>
// Manuel Caroli <Manuel.Caroli@sophia.inria.fr> // Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
#if (__GNUC__>4) || (__GNUC__ == 4 && __GNUC_MINOR__ >=6) #if defined(__GNUC__)
# pragma GCC diagnostic ignored "-Wunused-but-set-variable" # pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif #endif

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/assertions_behaviour.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
//#define CGAL_TESTING_POLYLINE_SIMPLIFICATION //#define CGAL_TESTING_POLYLINE_SIMPLIFICATION
//#define CGAL_POLYLINE_SIMPLIFICATION_TRACE_LEVEL 15 //#define CGAL_POLYLINE_SIMPLIFICATION_TRACE_LEVEL 15
@ -342,10 +340,8 @@ MainWindow::open(QString fileName)
this->addToRecentFiles(fileName); this->addToRecentFiles(fileName);
} }
else if(fileName.endsWith(".wkt")){ else if(fileName.endsWith(".wkt")){
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
loadWKT(fileName); loadWKT(fileName);
this->addToRecentFiles(fileName); this->addToRecentFiles(fileName);
#endif
} }
} }
} }
@ -356,9 +352,7 @@ MainWindow::on_actionLoadConstraints_triggered()
QString fileName = QFileDialog::getOpenFileName(this, QString fileName = QFileDialog::getOpenFileName(this,
tr("Open Constraint File"), tr("Open Constraint File"),
"../data" "../data"
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
,tr("Polylines (*.osm *.wkt);;") ,tr("Polylines (*.osm *.wkt);;")
#endif
); );
open(fileName); open(fileName);
} }
@ -375,13 +369,8 @@ std::string trim_right ( std::string str )
return std::string("") ; return std::string("") ;
} }
void MainWindow::loadWKT(QString void MainWindow::loadWKT(QString fileName)
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
fileName
#endif
)
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
typedef std::vector<Point_2> MultiPoint; typedef std::vector<Point_2> MultiPoint;
typedef std::vector<Point_2> LineString; typedef std::vector<Point_2> LineString;
@ -419,7 +408,6 @@ void MainWindow::loadWKT(QString
Q_EMIT( changed()); Q_EMIT( changed());
actionRecenter->trigger(); 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_Delaunay_triangulation_2.h>
#include <CGAL/Constrained_triangulation_plus_2.h> #include <CGAL/Constrained_triangulation_plus_2.h>
#include <CGAL/Polyline_simplification_2/simplify.h> #include <CGAL/Polyline_simplification_2/simplify.h>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif
namespace PS = CGAL::Polyline_simplification_2; namespace PS = CGAL::Polyline_simplification_2;
@ -56,7 +54,6 @@ void print(const CT& ct, Constraint_id cid)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
std::ifstream ifs( (argc==1)?"data/polygon.wkt":argv[1]); std::ifstream ifs( (argc==1)?"data/polygon.wkt":argv[1]);
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
const bool remove_points = false; const bool remove_points = false;
CT ct; CT ct;
Polygon_with_holes_2 P; 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); PS::simplify(ct, cid, Cost(), Stop(0.5), remove_points);
ct.remove_points_without_corresponding_vertex(cid); ct.remove_points_without_corresponding_vertex(cid);
print(ct, cid); print(ct, cid);
#else
ifs.close();
#endif
return 0; return 0;
} }

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

@ -1,7 +1,6 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -58,10 +57,3 @@ int main(int argc, char* argv[])
return 0; 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/config.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -30,9 +29,3 @@ int main(int argc, char* argv[])
return 0; 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/config.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #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 std::deque<Point_2> Polyline_2;
typedef PS::Stop_above_cost_threshold Stop; typedef PS::Stop_above_cost_threshold Stop;
typedef PS::Squared_distance_cost Cost; typedef PS::Squared_distance_cost Cost;
#endif
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
Polyline_2 polyline; Polyline_2 polyline;
std::ifstream ifs( (argc==1)?"data/polyline.wkt":argv[1]); std::ifstream ifs( (argc==1)?"data/polyline.wkt":argv[1]);
CGAL::read_linestring_WKT(ifs, polyline); CGAL::read_linestring_WKT(ifs, polyline);
@ -32,6 +28,5 @@ int main(int argc, char* argv[])
for(std::size_t i=0; i < result.size(); ++i){ for(std::size_t i=0; i < result.size(); ++i){
std::cout << result[i] << std::endl; std::cout << result[i] << std::endl;
} }
#endif
return 0; return 0;
} }

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

@ -8,8 +8,6 @@
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel; //typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;
@ -42,9 +40,3 @@ int main(int argc, char* argv[])
} }
return 0; 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 <iostream>
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel; //typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;
@ -29,9 +27,3 @@ int main(int argc, char* argv[])
is.close(); is.close();
return 0; 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 <vector>
#include <deque> #include <deque>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel; //typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;
@ -44,9 +42,3 @@ int main(int argc, char* argv[])
} }
return 0; 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 <iostream>
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
//typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel; //typedef CGAL::Simple_cartesian<CGAL::Gmpq> Kernel;
typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
@ -44,9 +40,3 @@ int main(int argc, char* argv[])
} }
return 0; 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 #ifndef CGAL_IO_WKT_H
#define CGAL_IO_WKT_H #define CGAL_IO_WKT_H
#if defined(DOXYGEN_RUNNING) || (!defined(BOOST_GCC) || BOOST_GCC >= 40500))
#include <CGAL/Point_2.h> #include <CGAL/Point_2.h>
#include <CGAL/Point_3.h> #include <CGAL/Point_3.h>
#include <CGAL/Polygon_2.h> #include <CGAL/Polygon_2.h>
@ -576,6 +574,4 @@ bool read_WKT(std::istream& is,
} // namespace CGAL } // namespace CGAL
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_H #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 #ifndef CGAL_IO_WKT_TRAITS_LINESTRING_H
#define CGAL_IO_WKT_TRAITS_LINESTRING_H #define CGAL_IO_WKT_TRAITS_LINESTRING_H
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h> #include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp> #include <boost/geometry/io/wkt/write.hpp>
@ -36,5 +34,4 @@ struct tag<CGAL::internal::Geometry_container<R, linestring_tag> >
} // namespace geometry } // namespace geometry
} // namespace boost } // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_LINESTRING_H #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 #ifndef CGAL_IO_WKT_TRAITS_MULTILINESTRING_H
#define CGAL_IO_WKT_TRAITS_MULTILINESTRING_H #define CGAL_IO_WKT_TRAITS_MULTILINESTRING_H
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h> #include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp> #include <boost/geometry/io/wkt/write.hpp>
@ -37,5 +35,4 @@ struct tag<CGAL::internal::Geometry_container<R, multi_linestring_tag> >
} // namespace geometry } // namespace geometry
} // namespace boost } // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_MULTILINESTRING_H #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 #ifndef CGAL_IO_WKT_TRAITS_MULTIPOINT_H
#define CGAL_IO_WKT_TRAITS_MULTIPOINT_H #define CGAL_IO_WKT_TRAITS_MULTIPOINT_H
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h> #include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp> #include <boost/geometry/io/wkt/write.hpp>
@ -36,6 +34,4 @@ struct tag<CGAL::internal::Geometry_container<R, multi_point_tag > >
} // namespace traits } // namespace traits
} // namespace geometry } // namespace geometry
} // namespace boost } // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_MULTIPOINT_H #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 #ifndef CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H
#define CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H #define CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/internal/Geometry_container.h> #include <CGAL/internal/Geometry_container.h>
#include <boost/geometry/io/wkt/write.hpp> #include <boost/geometry/io/wkt/write.hpp>
@ -37,6 +35,5 @@ struct tag<CGAL::internal::Geometry_container<R, multi_polygon_tag> >
} // namespace geometry } // namespace geometry
} // namespace boost } // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_MULTIPOLYGON_H #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 #ifndef CGAL_IO_WKT_TRAITS_POINT_H
#define CGAL_IO_WKT_TRAITS_POINT_H #define CGAL_IO_WKT_TRAITS_POINT_H
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/number_utils.h> #include <CGAL/number_utils.h>
#include <CGAL/Point_2.h> #include <CGAL/Point_2.h>
@ -69,5 +67,4 @@ struct access<CGAL::Point_2<K>, 1>
} // namespace geometry } // namespace geometry
} // namespace boost } // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_POINT_H #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 #ifndef CGAL_IO_WKT_TRAITS_POINT_3_H
#define CGAL_IO_WKT_TRAITS_POINT_3_H #define CGAL_IO_WKT_TRAITS_POINT_3_H
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/number_utils.h> #include <CGAL/number_utils.h>
#include <CGAL/Point_3.h> #include <CGAL/Point_3.h>
@ -76,5 +74,4 @@ struct access<CGAL::Point_3<K>, 2>
} // namespace geometry } // namespace geometry
} // namespace boost } // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_POINT_3_H #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 #ifndef CGAL_IO_WKT_TRAITS_POLYGON_H
#define CGAL_IO_WKT_TRAITS_POLYGON_H #define CGAL_IO_WKT_TRAITS_POLYGON_H
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/Polygon_2.h> #include <CGAL/Polygon_2.h>
#include <CGAL/Polygon_with_holes_2.h> #include <CGAL/Polygon_with_holes_2.h>
#include <CGAL/Point_2.h> #include <CGAL/Point_2.h>
@ -101,5 +99,4 @@ struct range_value<CGAL::Polygon_2<K> >
} // namespace boost } // namespace boost
#endif // BOOST VERSION CHECKS
#endif // CGAL_IO_WKT_TRAITS_POLYGON_H #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 #ifndef GEOMETRY_CONTAINER_H
#define GEOMETRY_CONTAINER_H #define GEOMETRY_CONTAINER_H
#if(! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <boost/geometry/io/wkt/write.hpp> #include <boost/geometry/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp> #include <boost/geometry/io/wkt/read.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@ -118,4 +117,3 @@ struct range_mutable_iterator<CGAL::internal::Geometry_container<T, TAG> >
}//end boost }//end boost
#endif // GEOMETRY_CONTAINER_H #endif // GEOMETRY_CONTAINER_H
#endif

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

@ -1,6 +1,5 @@
#include <iostream> #include <iostream>
#if (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
@ -279,9 +278,4 @@ int main()
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#else
int main(int, char**)
{
return EXIT_SUCCESS;
}
#endif

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

@ -1,13 +1,4 @@
#include <CGAL/config.h> #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/Epick_d.h>
#include <CGAL/Delaunay_triangulation.h> #include <CGAL/Delaunay_triangulation.h>
@ -48,5 +39,3 @@ int main()
} }
return 0; return 0;
} }
#endif

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

@ -1,12 +1,4 @@
#include <CGAL/config.h> #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/Epick_d.h>
#include <CGAL/point_generators_d.h> #include <CGAL/point_generators_d.h>
@ -50,4 +42,3 @@ int main()
return 0; return 0;
} }
#endif

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

@ -1,13 +1,4 @@
#include <CGAL/config.h> #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/Epick_d.h>
#include <CGAL/Epeck_d.h> #include <CGAL/Epeck_d.h>
@ -145,5 +136,3 @@ int main(int argc, char **argv)
cerr << endl; cerr << endl;
return 0; return 0;
} }
#endif

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

@ -1,13 +1,4 @@
#include <CGAL/config.h> #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/Epick_d.h>
#include <CGAL/internal/Combination_enumerator.h> #include <CGAL/internal/Combination_enumerator.h>
@ -152,4 +143,3 @@ int main(int argc, char **argv)
return 0; return 0;
} }
#endif

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

@ -1,12 +1,4 @@
#include <CGAL/config.h> #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/Epick_d.h>
#include <CGAL/point_generators_d.h> #include <CGAL/point_generators_d.h>
#include <CGAL/Triangulation.h> #include <CGAL/Triangulation.h>
@ -166,5 +158,3 @@ int main(int argc, char **argv)
cerr << std::endl; cerr << std::endl;
return 0; return 0;
} }
#endif