Add missing includes to get BOOST_VERSION and BOOST_GCC

This commit is contained in:
Maxime Gimeno 2019-04-03 10:27:55 +02:00
parent 0b31e6e5d8
commit 422cd589c1
26 changed files with 68 additions and 10 deletions

View File

@ -1,5 +1,6 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Delaunay_triangulation_2.h> #include <CGAL/Delaunay_triangulation_2.h>

View File

@ -1,5 +1,6 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Apollonius_graph_2.h> #include <CGAL/Apollonius_graph_2.h>

View File

@ -1,5 +1,7 @@
#include <fstream> #include <fstream>
#include <cmath> #include <cmath>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Cartesian.h> #include <CGAL/Cartesian.h>

View File

@ -1,4 +1,5 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#include <fstream> #include <fstream>
// CGAL headers // CGAL headers

View File

@ -31,6 +31,8 @@
#include <QActionGroup> #include <QActionGroup>
#include <QFileDialog> #include <QFileDialog>
#include <QInputDialog> #include <QInputDialog>
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif #endif

View File

@ -1,5 +1,7 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Periodic_2_triangulation_2.h> #include <CGAL/Periodic_2_triangulation_2.h>

View File

@ -11,6 +11,8 @@
#include <CGAL/linear_least_squares_fitting_2.h> #include <CGAL/linear_least_squares_fitting_2.h>
#include <CGAL/extremal_polygon_2.h> #include <CGAL/extremal_polygon_2.h>
#include <CGAL/minkowski_sum_2.h> #include <CGAL/minkowski_sum_2.h>
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <CGAL/IO/WKT.h> #include <CGAL/IO/WKT.h>
#endif #endif

View File

@ -6,7 +6,8 @@
// CGAL headers // CGAL headers
#include "svd-typedefs.h" #include "svd-typedefs.h"
#include <boost/config.hpp>
#include <boost/version.hpp>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
// Qt headers // Qt headers

View File

@ -8,7 +8,8 @@
#include "svd-typedefs.h" #include "svd-typedefs.h"
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#include <boost/config.hpp>
#include <boost/version.hpp>
// Qt headers // Qt headers
#include <QtGui> #include <QtGui>
#include <QString> #include <QString>

View File

@ -1,5 +1,7 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_exact_constructions_kernel.h> #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Snap_rounding_traits_2.h> #include <CGAL/Snap_rounding_traits_2.h>

View File

@ -1,4 +1,6 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/point_generators_2.h> #include <CGAL/point_generators_2.h>

View File

@ -1,5 +1,6 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Stream_lines_2.h> #include <CGAL/Stream_lines_2.h>

View File

@ -5,6 +5,8 @@
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include <list> #include <list>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

View File

@ -1,4 +1,6 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

View File

@ -1,4 +1,6 @@
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

View File

@ -3,6 +3,8 @@
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include <deque> #include <deque>
#include <boost/config.hpp>
#include <boost/version.hpp>
// CGAL headers // CGAL headers
#include <CGAL/Bbox_2.h> #include <CGAL/Bbox_2.h>

View File

@ -1,5 +1,8 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <boost/config.hpp>
#include <boost/version.hpp>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polygon_2.h> #include <CGAL/Polygon_2.h>
#include <CGAL/Polygon_with_holes_2.h> #include <CGAL/Polygon_with_holes_2.h>

View File

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

View File

@ -1,3 +1,5 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -14,10 +16,9 @@ typedef CGAL::Polygon_2<K> Polygon_2;
typedef CGAL::Polygon_with_holes_2<K> Polygon_with_holes_2; typedef CGAL::Polygon_with_holes_2<K> Polygon_with_holes_2;
typedef PS::Stop_below_count_ratio_threshold Stop; typedef PS::Stop_below_count_ratio_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 BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500)
std::ifstream ifs( (argc==1)?"data/polygon.wkt":argv[1]); std::ifstream ifs( (argc==1)?"data/polygon.wkt":argv[1]);
Polygon_with_holes_2 polygon; Polygon_with_holes_2 polygon;
CGAL::read_polygon_WKT(ifs, polygon); CGAL::read_polygon_WKT(ifs, polygon);
@ -27,6 +28,11 @@ int main(int argc, char* argv[])
std::cout.precision(12); std::cout.precision(12);
CGAL::write_polygon_WKT(std::cout, polygon) << std::endl; CGAL::write_polygon_WKT(std::cout, polygon) << std::endl;
#endif
return 0; return 0;
} }
#else
int main()
{
return 0;
}
#endif

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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