Commit Graph

300 Commits

Author SHA1 Message Date
Laurent Rineau 78ca6bb109 Merge pull request #5292 from maxGimeno/CTest-Fix_examples_and_tests_for_ctest-maxGImeno
CTest: Fix some examples and tests
2021-01-06 16:11:25 +01:00
Sébastien Loriot 41ceed5347 match requirements of CGAL adaptors 2021-01-06 12:59:12 +01:00
Sébastien Loriot cef46c9ee6 replace bind in STL_extension 2021-01-06 12:59:12 +01:00
Maxime Gimeno dc291b8c0d Fix tests and examples for ctest. 2020-12-17 14:27:54 +01:00
Laurent Rineau 2264a204ed Merge pull request #5261 from lrineau/fix-Wnon-c-typedef-for-linkage
Fix warnings [-Wnon-c-typedef-for-linkage] In Ridges and Jet_fitting
2020-12-16 17:49:14 +01:00
Laurent Rineau a98d5ec638 Merge pull request #5261 from lrineau/fix-Wnon-c-typedef-for-linkage
Fix warnings [-Wnon-c-typedef-for-linkage] In Ridges and Jet_fitting
2020-12-16 17:47:53 +01:00
Maxime Gimeno c7c5ae9150 add missing define 2020-12-11 13:56:35 +01:00
Laurent Rineau 71d489d3cb Fix also a TBB deprecation warning 2020-12-10 15:30:27 +01:00
Maxime Gimeno cc00d293df Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-11-06 09:37:18 +01:00
Simon Giraudot 9d21b57013 Test multiset with CC allocation 2020-10-22 08:59:48 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF
CMake: Use Imported Targets for 3rd Party Libs
2020-06-05 17:54:14 +02:00
Laurent Rineau dcc4fb1cc1 Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
# Conflicts:
#	STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Sebastien Loriot 98fafe4ef1
Merge pull request #4514 from MaelRL/CGAL-Fix_warnings-GF
Fix (some) testuite warnings
2020-04-16 18:15:11 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé 3ddf7e7287 Fix warning (ignoring return of nodiscard-marked functions)
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-115/STL_Extension/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Debug-64bits.gz
2020-04-06 22:24:24 +02:00
Sébastien Loriot 2e180ac589 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:29:44 +01:00
Sébastien Loriot a0345b135c Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:29:05 +01:00
Sébastien Loriot d1a323c730 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:24:14 +01:00
Sébastien Loriot 86e25f7e71 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:23:54 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Simon Giraudot 63c1090c04 Upate test_for_each 2020-03-23 13:42:45 +01:00
Simon Giraudot c8aa0c8f57 Prevent from testing Parallel_tag if TBB is not here 2020-03-19 15:54:53 +01:00
Laurent Rineau 378554e5a7 Change the API of `for_compact_container`/`Compact_container_traits`
Now, we have a proper pair of getter/setter, and the `void` pointer is
get by a `reinterpret_cast`, instead of a union.

Cc: @mglisse
2020-03-09 17:19:58 +01:00
Simon Giraudot b99402f953 Add convenient for_each to transparently use sequential/parallel/randomaccess/not 2020-03-02 12:23:10 +01:00
Laurent Rineau b311ab59ed [modernize-use-nullptr] (clang-tidy) 2020-01-31 12:11:16 +01:00
Laurent Rineau 2717864bd7 Fix warnings cppcoreguidelines-special-member-functions (clang-tidy)
- Remove trivial copy-constructors that prevents the compiler to
  generate the other special member functions.
2020-01-31 12:08:05 +01:00
Laurent Rineau db55548830 Fix a conversion warning 2020-01-31 12:01:43 +01:00
Laurent Rineau e82ea5de96 Add move-semantic to Compact_container
That required a refactoring the timestamper feature. And the
explanation why is quite long... Let's do it.

The CGAL triangulations use the `Rebind_TDS` feature. During the
instanciation of `Compact_container<T>` it is important that `T` is
allowed to be incomplete, otherwise the circular dependencies between
TDS and Vertex/Cell cannot be resolved by the compiler. In previous
implementation of the timestamper, to allow `T` to be an incomplete
type, the compact container only carried a *point* to the time
stamper, allocated on the heap. A moved-from compact container would
only be valid if one recreated a time stamper for it on the head in
the move-constructor. As I want move operations to be `noexcept`, I
needed to change that implementation. Now the triangulation always
carries a time stamp counter (`std::size`), independently of the type
`T`, and the time stamper is an empty class, with static methods. That
allows `T` to be incomplete during the declaration of
`Compact_container<T>`.
2020-01-31 11:29:55 +01:00
Maxime Gimeno 35600534f0 fixes 2020-01-21 10:05:19 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Maxime Gimeno 64253458aa Fix warnings 2019-07-12 10:49:10 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Laurent Rineau b18f6e907f Fix one remaining compilation error 2019-05-09 16:03:15 +02:00
Laurent Rineau 3a32f3f3ef Restore CGAL::cpp11 temporarily
This reverts commit 04978d8aae.
2019-04-01 18:27:35 +02:00
Sébastien Loriot 04978d8aae remove test no longer needed 2019-03-29 13:28:33 +01:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Sébastien Loriot 3cfbccd44a remove workaround c++11 features in STL_extension 2019-03-29 10:41:49 +01:00
Andreas Fabri a1609350aa Remove #include<CGAL/basic.h> amd put what is needed if something is missing 2019-03-27 15:21:33 +01:00
Andreas Fabri e62ab30e6c Fixes of fixes 2019-02-15 09:03:58 +01:00
Andreas Fabri fa2882cc00 Fix STL_extensions 2019-01-24 18:24:57 +01:00
Andreas Fabri ade4903000 Fix Voronoi 2019-01-22 19:07:32 +01:00
Andreas Fabri e294889e80 More casts to avoid warning 2018-11-29 10:46:48 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Laurent Rineau 048934bb6c Parallel compact container and Mesh_3 deterministic with 1 thread 2018-10-03 17:35:10 +02:00
Mael Rouxel-Labbé 4c789c2e8a Fixed typo in comment 2018-06-13 17:30:46 +02:00
Mael Rouxel-Labbé 27eb601598 Added a test for join iterators 2018-06-13 15:28:52 +02:00
Mael Rouxel-Labbé b41f1d6272 Various deprecation-related improvements 2018-05-18 16:47:54 +02:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 3955f031bd Fix examples/tests/demos 2018-04-04 14:18:22 +01:00
Andreas Fabri be20f518e7 Use CGAL_USE() 2018-03-30 13:32:39 +01:00
Andreas Fabri f4ec38e27c STL_extensions 2018-01-18 14:15:21 +00:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Maxime Gimeno 96f7b0f138 Fix catch value warnings 2017-07-21 11:27:14 +02:00
Laurent Rineau e294cd8fe9 Fix new (recycled) time stamps when a TDS is copied 2017-05-18 10:57:13 +02:00
Laurent Rineau 7a84cbceea Merge pull request #1509 from gdamiand/Compact_container-add_debug_function-gdamiand
Add index function in Compact container
2016-10-17 10:01:27 +02:00
Guillaume Damiand 5626eeae92 Add test of index and operator[] for compact container. 2016-10-06 08:39:25 -04:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Andreas Fabri fe222f586e Include <CGAL/use.h> How did that get included before??? 2016-10-03 09:00:00 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sebastien Loriot 48da87c2b5 Merge pull request #732 from afabri/CGAL-replace_bind-GF
Replace all std::bind with boost::bind
2016-02-07 18:21:05 +01:00
Andreas Fabri 52f8129579 replace all std::bind with boost::bind 2016-02-04 08:59:38 +01:00
Simon Giraudot 751d959c05 Fix boost unused typedef warning: replace BOOST_STATIC_ASSERT by CGAL_static_assertion 2016-02-02 14:32:46 +01:00
Sebastien Loriot b5546cb802 Merge pull request #486 from lrineau/Installation-visual_leak_detector-lrineau
Enable the use of Visual Leak Detector in CGAL
2015-11-26 14:30:14 +01:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Guillaume Damiand 2711acd67c Update is_used test. 2015-08-31 20:45:08 +02:00
Guillaume Damiand 6f1850a55a Remove unused code 2015-08-31 09:18:26 +02:00
Guillaume Damiand 56b5057449 Add test in STL_Extension for is_used. 2015-08-31 08:56:45 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00
Andreas Fabri 2cee9fc33e Merge branch 'CGAL-misc_warnings-GF'
Approved by the release manager
2015-01-12 13:00:41 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Andreas Fabri b8ef643b60 use CGAL_USE_TYPE 2015-01-08 10:33:50 +01:00
Andreas Fabri 13db26b8ca use CGAL_USE_TYPE 2014-12-31 13:45:08 +01:00
Jane Tournois 3a5a65f264 update branch 2014-12-08 17:30:41 +01:00
Guillaume Damiand ebc4300334 Header only for random.cpp.
For the header only version, the global variable default_random no more exist => we need to replace all occurences of default_random by a call to the global function get_default_random().
As usual, no modification for the non header only version.
2014-11-14 14:20:26 +01:00
Andreas Fabri 43b8390a70 Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF 2014-08-08 12:47:15 +02:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +02:00
Clement Jamin fbf824c711 Merge branch 'Mesh_3-parallel-cjamin'
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3

Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
Sébastien Loriot 2aadba50d7 Merge branch 'BGL-redesign_final-GF'
Introduces a redesign of the CGAL extension of the BGL API

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
Sébastien Loriot fee85470c1 Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf
Conflicts:
	.gitattributes
	Matrix_search/include/CGAL/rectangular_3_center_2.h
	Spatial_sorting/include/CGAL/spatial_sort.h
2014-07-03 16:34:46 +02:00
Clement Jamin e3abf7fc40 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-07-01 10:38:14 +02:00
Clement Jamin 15272293a8 Fix compilation with GCC 2014-06-30 21:29:12 +02:00
Clement Jamin 97c0d3f0ce Add a CMakeLists.txt file for STL_Extension tests (needed for TBB) 2014-06-30 16:38:05 +02:00
Laurent Rineau e77004089d Display a note if TBB is not availlable 2014-06-25 19:37:29 +02:00
Sébastien Loriot 675d26e884 add non-documented remove_const fcts to turn a const-iterator to an iterator 2014-06-24 16:35:10 +02:00
Clement Jamin e92101ceaa Replaced some C++11 lambda functions by functors 2014-06-05 11:43:02 +02:00
Clement Jamin 5576570846 Clean-up temporary/debug code 2014-05-23 14:42:51 +02:00
Sébastien Loriot 3fa09693a3 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
	Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
	Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp
2014-05-21 18:24:17 +02:00
Sébastien Loriot d34ebbaafa update names in the testsuite 2014-05-21 16:19:12 +02:00