Commit Graph

102 Commits

Author SHA1 Message Date
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Laurent Rineau 871c97273a Merge pull request #4496 from lrineau/CGAL-move_semantic_for_triangulations-GF
Add move-semantic to Compact_container and Triangulations
2020-06-03 16:23:22 +02:00
Laurent Rineau 20bc78a7d7 Merge pull request #4726 from afabri/Mesh_2-deterministic_V2-GF
Mesh_2: Make it deterministic  V2
2020-05-27 16:33:28 +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
Laurent Rineau fcc5ccca53 Merge pull request #4669 from gdamiand/CGAL_warning-gdamiand
Remove "unused-but-set-parameter" warnings
2020-05-18 12:24:44 +02:00
Andreas Fabri 7a6bdc1946 Mesh_2: make it deterministic 2020-05-15 14:16:56 +01:00
Michael Hemmer eb51eb0487
Prevent dynamic binding of references to null pointers
This is a manually-generated change. Ensure that behavior and style are
preserved by carefully inspecting the diff.
2020-04-26 07:52:46 +02:00
Guillaume Damiand 74d89220e2 Remove warnings 2020-04-20 15:25:40 +02: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 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +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
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
Laurent Rineau 7508a6f93c Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF 2020-02-12 17:05:49 +01:00
Laurent Rineau 14b8930f79 Fix a clang-tidy warning by using nullptr instead of 0 2020-01-31 15:48:45 +01:00
Laurent Rineau aed73efb46 Move-semantic for TDS_2 2020-01-31 14:20:39 +01:00
Mael Rouxel-Labbé 2c2313ea44 Do not use inheritance in concepts 2020-01-16 12:23:21 +01:00
Laurent Rineau 0567554126 Merge pull request #4363 from afabri/TDS_3-doc-GF
TDS_2/3: Cleanup in the documentation
2020-01-15 17:23:57 +01:00
Mael Rouxel-Labbé 9d58d7ff67 Document the parameter template of CGAL::T_DS_vertex/face/cell_23 2019-12-30 18:57:16 +01:00
Mael Rouxel-Labbé 19ceed98b8 Misc minor fixes 2019-12-30 18:32:04 +01:00
Mael Rouxel-Labbé ba7c36850a Remove Rebind_vertex/Face from TDS2 concept
The rebind mechanism is for the model CGAL::TDS_2, not the concept TDS2
where this doesn't make sense.
2019-12-30 18:24:11 +01:00
Mael Rouxel-Labbé 4b693695cd Don't duplicate requirements between TriangulationDSFace and TDS2::Face 2019-12-30 18:23:37 +01:00
Mael Rouxel-Labbé fb539f605c TriangulationDSVertexBase_2 should refine TDS2::Vertex 2019-12-30 18:22:42 +01:00
Mael Rouxel-Labbé db357a9ecb TriangulationDSFaceBase_2 should refine TDS2::Face 2019-12-30 18:22:10 +01:00
Mael Rouxel-Labbé 0d7ce069ae Add a note explaining rebind mechanisms in the doc of vertex/face typedefs 2019-12-30 18:21:29 +01:00
Mael Rouxel-Labbé 80bfae0c78 Merge remote-tracking branch 'afabri/TDS_3-doc-GF' into TDS-Fix_doc-GF 2019-12-30 14:29:12 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Andreas Fabri 1b2ed599d7 Unify template parameter names and add tpram for TDS_2 2019-11-23 10:20:33 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau df49068ce4 Fix dependencies 2019-10-11 11:57:46 +02:00
Mael Rouxel-Labbé faf55abc73 Doc improvements 2019-10-01 14:35:02 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau dbb1cb6c9b Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
Triangulation_{2,3):  Add ranges
2019-07-01 11:16:05 +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
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Mael addad6c953
Do not define a halfedge range for TDS_2
Halfedges have no place in the TDS, and the only reason they exist
is because of the 2D triangulation graph traits. The latter are 
reworked in another PR (https://github.com/CGAL/cgal/pull/3885) 
such that there is no need to have halfedges defined in TDS_2/T2
2019-06-07 09:00:02 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 785ae04e0b Add ranges to Regular_triangulation_2 2019-06-04 12:45:42 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé aa4e1913d1 Partial revert of 42a1c49066
Halfedges in TDS2 and T2 were being used to get halfedges in the T2 graph traits
We now do it differently and without polluting the packages T2 and TDS2
2019-04-29 08:29:40 +02:00