From 1b10cd8d285f97276e9e0e033ea09c891b14a876 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 3 Feb 2016 10:44:41 +0100 Subject: [PATCH 1/7] Do not perform the test for g++ <= 4.2 --- NewKernel_d/test/NewKernel_d/Epick_d.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp index 356bae2ac0e..d30fc5b60fc 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -1,3 +1,15 @@ + +#include +#if (BOOST_GCC < 40300) + +#include +int main() +{ + std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; +} + +#else + //#define BOOST_RESULT_OF_USE_DECLTYPE 1 #include #include @@ -600,3 +612,5 @@ int main(){ test3(); test3(); } + +#endif From 38457b7285efe9faef663053c2c45cd87b42ea4b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 3 Feb 2016 10:52:42 +0100 Subject: [PATCH 2/7] fix --- NewKernel_d/test/NewKernel_d/Epick_d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp index d30fc5b60fc..5a5aff629e6 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -1,6 +1,6 @@ #include -#if (BOOST_GCC < 40300) +#if defined(BOOST_GCC) && (BOOST_GCC < 40300) #include int main() From 6262374378a87e8247ce0b845ae66201253fa96b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 3 Feb 2016 12:24:25 +0100 Subject: [PATCH 3/7] Do the same in package Triangulation --- NewKernel_d/test/NewKernel_d/Makefile | 17 ----------------- .../Triangulation/delaunay_triangulation.cpp | 13 +++++++++++++ .../examples/Triangulation/triangulation.cpp | 13 +++++++++++++ .../test/Triangulation/test_delaunay.cpp | 13 +++++++++++++ .../test/Triangulation/test_torture.cpp | 13 +++++++++++++ .../test/Triangulation/test_triangulation.cpp | 13 +++++++++++++ 6 files changed, 65 insertions(+), 17 deletions(-) delete mode 100644 NewKernel_d/test/NewKernel_d/Makefile diff --git a/NewKernel_d/test/NewKernel_d/Makefile b/NewKernel_d/test/NewKernel_d/Makefile deleted file mode 100644 index 1399658c7e6..00000000000 --- a/NewKernel_d/test/NewKernel_d/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -all: normal cxx11 - -CXX = g++ - -CGAL_INC = -I. -I../../include -I../../../Algebraic_foundations/include -I../../../STL_Extension/include -I../../../Number_types/include -I../../../Kernel_23/include -I../../../Installation/include -DCGAL_DISABLE_ROUNDING_MATH_CHECK - -EIGEN_INC = `pkg-config --cflags eigen3|sed -e 's/-I/-isystem/g'` -DCGAL_EIGEN3_ENABLED - -normal: - ${CXX} Epick_d.cpp -O2 -lCGAL -lboost_thread -frounding-math -Wall -Wextra -lmpfr -lgmp ${CGAL_INC} ${EIGEN_INC} - ./a.out - -cxx11: - ${CXX} -std=c++0x -O2 Epick_d.cpp -lCGAL -lboost_thread -frounding-math -Wall -Wextra -lmpfr -lgmp ${CGAL_INC} ${EIGEN_INC} -o b.out - ./b.out - -#-DBOOST_RESULT_OF_USE_DECLTYPE diff --git a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp index 3c1fa8babbc..572adde7058 100644 --- a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp +++ b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp @@ -1,3 +1,14 @@ +#include +#if defined(BOOST_GCC) && (BOOST_GCC < 40300) + +#include +int main() +{ + std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; +} + +#else + #include #include #include @@ -64,3 +75,5 @@ int main(int argc, char **argv) std::cout << " done in "< +#if defined(BOOST_GCC) && (BOOST_GCC < 40300) + +#include +int main() +{ + std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; +} + +#else + #include #include #include @@ -39,3 +50,5 @@ int main() return 0; } + +#endif diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index 9e7076f2194..371b648b50d 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -1,3 +1,14 @@ +#include +#if defined(BOOST_GCC) && (BOOST_GCC < 40300) + +#include +int main() +{ + std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; +} + +#else + #include #include #include @@ -124,3 +135,5 @@ int main(int argc, char **argv) cerr << endl; return 0; } + +#endif diff --git a/Triangulation/test/Triangulation/test_torture.cpp b/Triangulation/test/Triangulation/test_torture.cpp index 245127811c2..195fd58cb17 100644 --- a/Triangulation/test/Triangulation/test_torture.cpp +++ b/Triangulation/test/Triangulation/test_torture.cpp @@ -1,3 +1,14 @@ +#include +#if defined(BOOST_GCC) && (BOOST_GCC < 40300) + +#include +int main() +{ + std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; +} + +#else + #include #include #include @@ -144,3 +155,5 @@ int main(int argc, char **argv) cout << std::endl; return 0; } + +#endif diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp index 15b83c281de..7961cbfd191 100644 --- a/Triangulation/test/Triangulation/test_triangulation.cpp +++ b/Triangulation/test/Triangulation/test_triangulation.cpp @@ -1,3 +1,14 @@ +#include +#if defined(BOOST_GCC) && (BOOST_GCC < 40300) + +#include +int main() +{ + std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; +} + +#else + #include #include #include @@ -122,3 +133,5 @@ int main(int argc, char **argv) cerr << std::endl; return 0; } + +#endif From 8e7d4649738ca59ad89220ea91af9b8ce64816bd Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 4 Feb 2016 11:24:47 +0100 Subject: [PATCH 4/7] Replace BOOST test by direct test on __GNUC__ for old GCC/boost versions --- NewKernel_d/test/NewKernel_d/Epick_d.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp index 5a5aff629e6..8fa63bf6f9d 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -1,6 +1,4 @@ - -#include -#if defined(BOOST_GCC) && (BOOST_GCC < 40300) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) #include int main() From 52a20080ad69353acbf58ff5483e15320cfc542f Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 4 Feb 2016 11:40:50 +0100 Subject: [PATCH 5/7] Replace BOOST tests by direct tests on __GNUC__ for old GCC/boost versions --- .../examples/Triangulation/delaunay_triangulation.cpp | 3 +-- Triangulation/examples/Triangulation/triangulation.cpp | 3 +-- Triangulation/test/Triangulation/test_delaunay.cpp | 3 +-- Triangulation/test/Triangulation/test_torture.cpp | 3 +-- Triangulation/test/Triangulation/test_triangulation.cpp | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp index 572adde7058..ffc3c5c94fd 100644 --- a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp +++ b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp @@ -1,5 +1,4 @@ -#include -#if defined(BOOST_GCC) && (BOOST_GCC < 40300) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) #include int main() diff --git a/Triangulation/examples/Triangulation/triangulation.cpp b/Triangulation/examples/Triangulation/triangulation.cpp index 1b3d6975521..455a221f0e5 100644 --- a/Triangulation/examples/Triangulation/triangulation.cpp +++ b/Triangulation/examples/Triangulation/triangulation.cpp @@ -1,5 +1,4 @@ -#include -#if defined(BOOST_GCC) && (BOOST_GCC < 40300) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) #include int main() diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index 371b648b50d..61a0cb09c10 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -1,5 +1,4 @@ -#include -#if defined(BOOST_GCC) && (BOOST_GCC < 40300) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) #include int main() diff --git a/Triangulation/test/Triangulation/test_torture.cpp b/Triangulation/test/Triangulation/test_torture.cpp index 195fd58cb17..b0202790a72 100644 --- a/Triangulation/test/Triangulation/test_torture.cpp +++ b/Triangulation/test/Triangulation/test_torture.cpp @@ -1,5 +1,4 @@ -#include -#if defined(BOOST_GCC) && (BOOST_GCC < 40300) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) #include int main() diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp index 7961cbfd191..1e499564b1d 100644 --- a/Triangulation/test/Triangulation/test_triangulation.cpp +++ b/Triangulation/test/Triangulation/test_triangulation.cpp @@ -1,5 +1,4 @@ -#include -#if defined(BOOST_GCC) && (BOOST_GCC < 40300) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) #include int main() From 30ed96c71e847cef60c0f5ff72464f354b999025 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 4 Feb 2016 12:38:59 +0100 Subject: [PATCH 6/7] Update NOTICE messages with correct G++ version --- NewKernel_d/test/NewKernel_d/Epick_d.cpp | 2 +- Triangulation/examples/Triangulation/delaunay_triangulation.cpp | 2 +- Triangulation/examples/Triangulation/triangulation.cpp | 2 +- Triangulation/test/Triangulation/test_delaunay.cpp | 2 +- Triangulation/test/Triangulation/test_torture.cpp | 2 +- Triangulation/test/Triangulation/test_triangulation.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp index 8fa63bf6f9d..d6a9f26cb17 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -3,7 +3,7 @@ #include int main() { - std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; + std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; } #else diff --git a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp index ffc3c5c94fd..45c32c39a05 100644 --- a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp +++ b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp @@ -3,7 +3,7 @@ #include int main() { - std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; + std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; } #else diff --git a/Triangulation/examples/Triangulation/triangulation.cpp b/Triangulation/examples/Triangulation/triangulation.cpp index 455a221f0e5..660c0bdc530 100644 --- a/Triangulation/examples/Triangulation/triangulation.cpp +++ b/Triangulation/examples/Triangulation/triangulation.cpp @@ -3,7 +3,7 @@ #include int main() { - std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; + std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; } #else diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index 61a0cb09c10..ee268963c22 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -3,7 +3,7 @@ #include int main() { - std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; + std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; } #else diff --git a/Triangulation/test/Triangulation/test_torture.cpp b/Triangulation/test/Triangulation/test_torture.cpp index b0202790a72..8a5d31a871c 100644 --- a/Triangulation/test/Triangulation/test_torture.cpp +++ b/Triangulation/test/Triangulation/test_torture.cpp @@ -3,7 +3,7 @@ #include int main() { - std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; + std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; } #else diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp index 1e499564b1d..316cd21a032 100644 --- a/Triangulation/test/Triangulation/test_triangulation.cpp +++ b/Triangulation/test/Triangulation/test_triangulation.cpp @@ -3,7 +3,7 @@ #include int main() { - std::cerr << "NOTICE: This test requires G++ > 4.2, and will not be compiled." << std::endl; + std::cerr << "NOTICE: This test requires G++ >= 4.4, and will not be compiled." << std::endl; } #else From 737261c3308da57dcd985ee08844fc6e5637e596 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 4 Feb 2016 17:58:22 +0100 Subject: [PATCH 7/7] Typo correction (__GNUC_MINOR__ instead of __GNU_MINOR__) --- NewKernel_d/test/NewKernel_d/Epick_d.cpp | 2 +- Triangulation/examples/Triangulation/delaunay_triangulation.cpp | 2 +- Triangulation/examples/Triangulation/triangulation.cpp | 2 +- Triangulation/test/Triangulation/test_delaunay.cpp | 2 +- Triangulation/test/Triangulation/test_torture.cpp | 2 +- Triangulation/test/Triangulation/test_triangulation.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp index d6a9f26cb17..20be0521177 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -1,4 +1,4 @@ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) #include int main() diff --git a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp index 45c32c39a05..0ab829b01f6 100644 --- a/Triangulation/examples/Triangulation/delaunay_triangulation.cpp +++ b/Triangulation/examples/Triangulation/delaunay_triangulation.cpp @@ -1,4 +1,4 @@ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) #include int main() diff --git a/Triangulation/examples/Triangulation/triangulation.cpp b/Triangulation/examples/Triangulation/triangulation.cpp index 660c0bdc530..043c3cd38f6 100644 --- a/Triangulation/examples/Triangulation/triangulation.cpp +++ b/Triangulation/examples/Triangulation/triangulation.cpp @@ -1,4 +1,4 @@ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) #include int main() diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index ee268963c22..6f9b8e729f2 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -1,4 +1,4 @@ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) #include int main() diff --git a/Triangulation/test/Triangulation/test_torture.cpp b/Triangulation/test/Triangulation/test_torture.cpp index 8a5d31a871c..3ec215278b9 100644 --- a/Triangulation/test/Triangulation/test_torture.cpp +++ b/Triangulation/test/Triangulation/test_torture.cpp @@ -1,4 +1,4 @@ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) #include int main() diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp index 316cd21a032..eecc6338171 100644 --- a/Triangulation/test/Triangulation/test_triangulation.cpp +++ b/Triangulation/test/Triangulation/test_triangulation.cpp @@ -1,4 +1,4 @@ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNU_MINOR__ < 4) +#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 4) && (__GNUC_MINOR__ < 4) #include int main()