Laurent Rineau
69d9025736
Merge pull request #6760 from hoskillua/gsoc2022
...
GSoC2022 - Interpolated Corrected Curvatures
# Conflicts:
# Installation/CHANGES.md
2023-11-15 16:00:36 +01:00
Laurent Rineau
46923342ad
Merge pull request #7576 from albert-github/feature/issue_7395
...
issue #7395 Improvement of layout of model relations
# Conflicts:
# Kernel_23/doc/Kernel_23/CGAL/Vector_2.h
2023-09-07 10:48:34 +02:00
Laurent Rineau
b32a8331ed
Merge branch '5.6.x-branch'
...
# Conflicts:
# Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
2023-09-07 10:41:33 +02:00
Laurent Rineau
a8fae00bf1
missing header
2023-09-07 10:35:03 +02:00
hoskillua
a94a7337c2
Merge remote-tracking branch 'upstream/master' into gsoc2022
2023-08-25 14:51:46 +03:00
albert-github
93001308f4
Merge branch 'master' into feature/issue_7395
...
# Conflicts:
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot
eada3ee8ca
Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl'
2023-08-14 14:19:25 +02:00
Sébastien Loriot
5db243629a
try working around an error with MSVC2017
...
`error C2338: Sorry: std::any doesn't support over-aligned types at this time.`
2023-08-14 14:02:39 +02:00
albert-github
ad41766454
issue #7395 Improvement of layout of model relations
...
Corrected `cgalModels` to `cgalHasModes` inside `cgalHasNodelsBegin` / `cgalHasModelsEnd`
2023-07-18 13:23:37 +02:00
albert-github
de3ba0f47c
Merge remote-tracking branch 'upstream/master' into feature/issue_7395
2023-07-17 10:17:34 +02:00
albert-github
4e5578d469
issue #7395 Improvement of layout of model relations
...
- based on review
2023-07-15 13:12:15 +02:00
albert-github
a0320dd7b4
Merge branch 'master' into feature/issue_7395
...
# Conflicts:
# Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h
2023-07-13 10:33:18 +02:00
Laurent Rineau
d10e9387c2
Merge branch 'master' into CGAL-add_missing_test
...
# Conflicts:
# STL_Extension/test/STL_Extension/test_skiplist.cpp
2023-07-12 15:48:42 +02:00
Laurent Rineau
4a2c7a668d
Merge pull request #7571 from albert-github/feature/issue_7454
...
issue #7454 Consistency of BigO notations
2023-07-12 15:29:56 +02:00
albert-github
301728a8a9
issue #7395 Improvement of layout of model relations
...
- Completed the cgalModels part
2023-07-09 12:43:36 +02:00
Sébastien Loriot
01ecc02e71
fix conversion warnings
2023-07-06 17:51:07 +02:00
Sébastien Loriot
d55638cfd1
remove unused variable
2023-07-06 17:49:14 +02:00
albert-github
ee2a55279d
issue #7395 Improvement of layout of model relations
...
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
2023-07-06 17:35:34 +02:00
Laurent Rineau
04077e9f4f
Merge pull request #7535 from lrineau/Triangulation_3-fix_simplex_traverser-GF-CGAL-5.6
...
fix simplex traverser for CGAL 5.6
2023-07-05 16:32:36 +02:00
Sébastien Loriot
b66afab814
Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD
2023-07-05 11:29:35 +02:00
albert-github
b3af96caa1
issue #7454 Consistency of BigO notations
...
Create `cgalBigO` marco and used it.
(`The macro `cgalBigOLarge` is for special situations where we need bigger round brackets)
2023-07-04 16:23:14 +02:00
Andreas Fabri
a9d99b3ece
int -> std::size_t
2023-06-29 09:24:15 +01:00
Sébastien Loriot
efd8b2d38b
add more missing tests
2023-06-27 11:18:20 +02:00
Sébastien Loriot
891fd47365
add missing test
2023-06-27 10:01:58 +02:00
Sébastien Loriot
dfc386d65b
Merge branch 'master' into HEAD
2023-06-22 14:05:45 +02:00
Sébastien Loriot
7d0dd109b3
fix for variant/optional<variant>
2023-06-21 11:19:58 +02:00
Laurent Rineau
ad9efd0e18
Merge branch '5.6.x-branch' into Triangulation_3-fix_simplex_traverser-GF-CGAL-5.6
...
# Conflicts:
# STL_Extension/include/CGAL/Base_with_time_stamp.h
# Triangulation_3/include/CGAL/Triangulation_3/internal/Triangulation_segment_traverser_3_impl.h
# Triangulation_3/test/Triangulation_3/CMakeLists.txt
2023-06-20 16:03:30 +02:00
Laurent Rineau
367466c434
Merge branch '5.5.x-branch' into Triangulation_3-fix_simplex_traverser-GF
2023-06-20 14:48:05 +02:00
Sébastien Loriot
0ee31a5d4f
remove extra parenthesis
2023-06-19 19:17:49 +02:00
Sébastien Loriot
f936680600
Merge remote-tracking branch 'cgal/master' into HEAD
2023-06-15 18:48:39 +02:00
Sébastien Loriot
640c98f21e
add utility to avoid duplicate in variant + use it in SMDS_3
2023-06-15 11:34:14 +02:00
Sébastien Loriot
9cdfe70abb
Merge remote-tracking branch 'sloriot/CGAL-toward_6.0'
2023-06-15 11:34:09 +02:00
Sébastien Loriot
9a0bdb5d96
boost::variant ---> std::variant
2023-06-15 10:57:10 +02:00
Sébastien Loriot
557b64e4a6
boost::any ==> std::any
2023-06-15 10:57:09 +02:00
Sébastien Loriot
604dcdc435
boost::optional => std::optional
2023-06-15 10:57:09 +02:00
Sébastien Loriot
bbc4d08ee0
Merge remote-tracking branch 'cgal/master' into HEAD
2023-06-15 10:47:07 +02:00
Sébastien Loriot
c8a88b9014
remove CGAL_static_assertion*
2023-06-15 10:42:10 +02:00
Sébastien Loriot
852b3b664b
expand -CGAL_CPP17_INLINE macro
2023-06-15 10:40:54 +02:00
Laurent Rineau
01e22be3b6
Merge pull request #7496 from lrineau/Triangulation_3-fix_regular_with_TBB-GF
...
Regular_triangulation_3: fix another race-condition
2023-06-07 17:36:41 +02:00
Laurent Rineau
6ab1337951
Merge pull request #7496 from lrineau/Triangulation_3-fix_regular_with_TBB-GF
...
Regular_triangulation_3: fix another race-condition
2023-06-07 17:36:25 +02:00
Laurent Rineau
8cd8bc7b06
another fix of a race-condition
2023-06-04 20:49:02 +02:00
Sebastien Loriot
002adea3ee
CGAL: Enable user to provide set_use_assertions() ( #7440 )
...
_Please use the following template to help us managing pull requests._
## Summary of Changes
As suggested by @GilesBathgate in Issue #7222 we give the (undocumented)
possibility to a user provided function.
## Release Management
* Affected package(s): STL_Extension
* License and copyright ownership: unchanged
2023-05-22 09:20:08 +02:00
Andreas Fabri
d076b250ee
CGAL: Enable user to provide set_use_assertions()
2023-05-12 11:01:11 +01:00
Laurent Rineau
36b3491672
add a new test case vfefv for the simplex traverser
...
For the moment, that new test fails.
2023-05-05 15:30:43 +02:00
Laurent Rineau
5893f7f4c4
Introduce Base_with_time_stamp
2023-05-05 14:43:35 +02:00
Jane Tournois
73a7d4ff09
Merge remote-tracking branch 'cgal/master' into Mesh_3-min_size-jtournois
...
# Conflicts:
# Installation/CHANGES.md
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
# STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
2023-05-05 09:17:33 +02:00
Laurent Rineau
d2bc415a15
Merge pull request #6950 from lrineau/CGAL-allow_Epick_with_float-GF
...
Simple_precision_epick: an Epick-like kernel with float as FT
2023-05-04 16:37:17 +02:00
Laurent Rineau
1449281db9
Merge pull request #7264 from MaelRL/SLS-Weighted_skeleton-GF
...
Weighted straight line skeletons
2023-05-04 16:37:12 +02:00
Sébastien Loriot
e0eac4f388
Merge remote-tracking branch 'cgal/master' into HEAD
2023-05-03 18:37:09 +02:00
Laurent Rineau
1b84329710
Merge pull request #7229 from GilesBathgate/General-safe_bool_idiom-GilesBathgate
...
Remove use of the safe-bool idiom, replace with explicit operator bool
2023-05-03 15:05:45 +02:00