songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
113,926 Commits 3 Branches 156 Tags 958 MiB
Commit Graph

2134 Commits

Author SHA1 Message Date
Laurent Rineau b50579bd09 another fix for the buggy compiler from MSVC 2017 2025-01-31 10:12:04 +01:00
Laurent Rineau 571c2ccadc fix compilation errors with C++>=20, or g++12.2.0 2025-01-30 17:39:32 +01:00
Sébastien Loriot 5b4b19a1c8 add cut_with_plane and new clip method 2025-01-28 14:54:27 +01:00
Sébastien Loriot 107f3696dc boost::tie -> std::tie 2025-01-24 14:20:00 +01:00
Sébastien Loriot eb0da467ed always init time_stamp to -1 2025-01-24 11:08:34 +01:00
Laurent Rineau 0dcc287941 add CGAL::unordered_flat_set 2025-01-23 17:23:12 +01:00
Laurent Rineau 9ddc5294fa cleanup in CGAL/Iterator_range.h 
... and add a default constructor to create an
empty range (with singular iterators).
 2025-01-23 09:32:51 +01:00
Laurent Rineau 1ce108778f rewrite/refactor a lot of the code 2025-01-22 16:03:26 +01:00
Mael Rouxel-Labbé 3b7a4ed21e Merge remote-tracking branch 'cgal/master' into Kernel_23-Fix_dangling_ref_in_CC3-GF 2025-01-16 11:52:34 +01:00
Laurent Rineau 2869ad810b fix compilation errors with C++<20 2025-01-15 19:08:01 +01:00
Laurent Rineau d4e6ffddf4 fix protection against min/max macros 
The regular expression I used was:

```
((?!(?:^.*(\/\/|\/\*).*|^ *\* .*|^[^"]*"(?:"[^"]*"|[^"])*))^(?:.*[ ,\(]|))(\b(?:(?:[A-Za-z]+::)*)(?:max|min))\b *\(
```
 2025-01-14 16:12:34 +01:00
Laurent Rineau bc8c1e6594 new allocator type, that allocates randomly on purpose 
To debug non-determinism on Linux platforms.
 2025-01-08 21:53:44 +01:00
Laurent Rineau ea151ff987 fix CGAL_USE_BARE_STD_MAP with Polyline_constraint_hierarchy_2 2025-01-08 21:15:22 +01:00
Mael Rouxel-Labbé b7de40afce Update enum_cast<Uncertain> calls to new API 2025-01-08 17:17:55 +01:00
Laurent Rineau 552685784b Add CGAL::unordered_flat_map implementation 
...and `refactor Polyline_constraint_hierarchy_2` to use it.

`CGAL::unordered_flat_map` will be Boost `unordered_flat_map` if availlable, or the standard `std::unordered_map` otherwise.
 2025-01-08 11:46:23 +01:00
Mael Rouxel-Labbé c85b3884fa Update test for enum_cast<Uncertain> 2024-12-29 23:37:47 +01:00
Mael Rouxel-Labbé 7b160e34e3 Template the Uncertain enum_cast overload with Uncertain, not base enum 
Templating by the base CGAL enum is just a way to have unintended
loss of uncertainty.
 2024-12-29 23:17:58 +01:00
Andreas Fabri a9a51d2af7 whitespace 2024-12-27 12:22:24 +00:00
Andreas Fabri bef2c3c706 Test Cartesian_const_iterator with Concatenate_iterator 2024-12-27 09:54:20 +00:00
Andreas Fabri 12801ed85a advance the iterator 2024-12-27 09:18:32 +00:00
Sébastien Loriot 9296fe78c2 hide force filtering and the traits in NP 2024-12-20 14:19:58 +01:00
Sébastien Loriot f78f51450b add missing operator 2024-12-20 11:21:07 +01:00
Jane Tournois 7e3aa09f2a complete move file 2024-12-19 22:03:28 +01:00
Jane Tournois a98101aa75 move tuple_like_helpers.h to STL_Extension to avoid dependency on Mesh_3 2024-12-19 17:38:14 +01:00
Laurent Rineau 8e5fab0c98 allow the initial points generator to be non-const 
A lot of type erasure was necessary.
 2024-12-18 16:45:25 +01:00
Laurent Rineau e2d11a0fc5 allow a range as parameter 
The preview implementation enforced the use of a full container.
 2024-12-18 13:44:54 +01:00
Andreas Fabri 000bae9889 Add operator+(int) and operator-(other) 2024-12-18 11:07:13 +00:00
Sébastien Loriot b32558b87e Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-12-16 11:47:34 +01:00
Sven Oesau b7e1841b1d added hidden named parameters for isovalue nudging and interior vertex placement 2024-12-16 11:32:48 +01:00
Sébastien Loriot c050bb15a3 Merge remote-tracking branch 'cgal/master' 2024-11-15 11:41:07 +01:00
Laurent Rineau 02632017a5 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-11-12 12:33:37 +01:00
Jane Tournois 75d3d30cb4 fix unused variable warnings and add a const 2024-11-05 10:27:54 +01:00
Jane Tournois f3abf598ed Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement 
# Conflicts:
#	Mesh_3/examples/Mesh_3/CMakeLists.txt
 2024-11-04 12:42:37 +01:00
Sebastien Loriot 1690619625
CGAL: Modernize CMakeLists.txt (#8528) 
## Summary of Changes

- Changed `PUBLIC` to `PRIVATE`  in the `target_link_libraries()`
- ~~Link against `Boost::<COMPONENT>`~~ as we do more than just linking
and must use the `CGAL::_.._support`
- Use `target_compile_definitions()` and `add_compile_definitions()`

More to be done.

## Release Management

* Affected package(s): all
* Issue(s) solved (if any): fix one item of  #4815
* License and copyright ownership: unchanged
 2024-10-31 10:32:25 +01:00
Jane Tournois f77f9c6847 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement 
# Conflicts:
#	Installation/CHANGES.md
 2024-10-23 16:35:56 +02:00
Sébastien Loriot dd25a38a14 Merge pull request #8467 from afabri/STL_extension-Openmesh_conversion-GF 
STL_extension: Add conversion operator
 2024-10-21 19:15:22 +02:00
Sébastien Loriot 619875392c Merge branch 'gsoc2023' into master 2024-10-18 14:33:31 +02:00
Laurent Rineau 96cd3e6f09 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-17 00:25:24 +02:00
Sven Oesau a06002ab2b Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-10-14 14:42:46 +02:00
Andreas Fabri 95616154d5 More PRIVATE in LCC and Generalized_map 2024-10-09 07:19:52 +01:00
Andreas Fabri 527569346e CGAL: Modernize CMakeLists.txt 2024-10-08 17:02:41 +01:00
albert-github dd02af92a2 issue #8515 Spelling mistakes found checking `en-GB` to `en-US` 
Spelling corrections, `en-GB` -> `en-US`
 2024-10-05 11:28:29 +02:00
Jane Tournois c1f2236ee3 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement 
# Conflicts:
#	Installation/CHANGES.md
 2024-09-30 14:02:09 +02:00
Jane Tournois 7c4ab1ca00 remove outdated named parameter 2024-09-30 13:04:00 +02:00
Jane Tournois f3b9a5ac84 doc (Mael's review) 2024-09-30 12:46:29 +02:00
Jane Tournois f0ad731919 cleaning 2024-09-30 12:12:54 +02:00
Jane Tournois f4e2b3db69 remove useless generator() accessor 2024-09-26 11:02:34 +02:00
Jane Tournois b3a8530dcf use new API with named paremeter initial_points_generator in demo 
and fix compilation issues
 2024-09-24 11:05:41 +02:00
Jane Tournois 39254bb7db introduce Dummy_initial_points_generator 
fix compilation of Mesh_3 tests and examples
 2024-09-20 17:17:41 +02:00
Jane Tournois b5740393b2 compilation of examples fixed 2024-09-20 13:58:24 +02:00
Jane Tournois 026850cf97 use initial points vector 2024-09-19 12:24:18 +02:00
Jane Tournois ce9cd9e596 wip PR https://github.com/CGAL/cgal/pull/7798 2024-09-17 18:04:40 +02:00
Andreas Fabri 54a5a10b8e resolve merge conflict 2024-09-10 08:40:22 +01:00
Andreas Fabri 82805a0c69 Re-add the fix 2024-09-10 08:35:23 +01:00
Andreas Fabri 726b9c9485 Show the problem in a test 2024-09-10 08:34:52 +01:00
Andreas Fabri 2983aa2ae3 Merge remote-tracking branch 'cgal/master' into Frechet-dev 2024-09-09 12:06:15 +01:00
Laurent Rineau 37f3bcfaab Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-09-09 10:57:33 +02:00
Andreas Fabri 22151a582f STL_extension: Add conversion operator 2024-09-08 12:26:21 +01:00
Sébastien Loriot 4cf1f4b214 CONFIG options is only needed if a FindXXX.cmake exists 2024-09-04 14:48:07 +02:00
Jane Tournois 3f6083e6ff use CGAL::OpenMesh_support in examples and tests 2024-08-27 14:06:16 +02:00
Laurent Rineau 600c63aca1 fix compilation with C++17 2024-07-09 01:37:41 +02:00
Laurent Rineau ed4fb14f74 merge master (WIP: need #8273) 2024-07-01 16:38:56 +02:00
Laurent Rineau e20cee0fcb new version, after review 2024-07-01 16:02:45 +02:00
Mael Rouxel-Labbé 67aba3fefe Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-06-20 10:18:49 +02:00
Sébastien Loriot 9e2f375d10 check if Kernel provides the nested type 2024-06-19 11:21:44 +02:00
Laurent Rineau 089cb17bcf
Poisson: fix dependencies (#8282) 2024-06-13 12:55:34 +02:00
Laurent Rineau 6f4b598b6a Merge pull request #8278 from albert-github/feature/bug_spell_20240511 
Spelling correction
 2024-06-13 12:48:43 +02:00
Sébastien Loriot 86866e232e remove Surface_mesher from doc deps 2024-06-12 20:34:54 +02:00
Laurent Rineau 1b534cd347 Merge pull request #8248 from sloriot/CGAL-deprecate_Surface_mesher 
deprecate Surface_mesher package
 2024-06-12 10:06:14 +02:00
Laurent Rineau 32893b91c0 Merge pull request #8263 from lrineau/CGAL-update_minimal_cmake-GF 
cmake_minimum_required(VERSION 3.12...3.29)
 2024-06-12 10:06:12 +02:00
albert-github c35a0a7f11 Spelling correction 
Spelling correction due to updated dictionary.
(dictionary was updated after the previous spelling correction :-( )
 2024-06-11 10:12:12 +02:00
Laurent Rineau 3a223ebd1e cmake_minimum_required(VERSION 3.12...3.29) 2024-06-06 20:19:44 +02:00
Laurent Rineau 6c6814dd2f ...and sort the files 2024-06-06 10:17:23 +02:00
Laurent Rineau 76a829e6d4 move manifold tags to <CGAL/tags.h> 2024-06-05 19:08:29 +02:00
albert-github 36c8b7589d Spelling corrections 
Last batch (for now) of spelling corrections in doxygen and normal comments
 2024-05-31 19:05:34 +02:00
Sebastien Loriot d06a57a292
Mesh_3 edge_distance criterion : an upper bound for the distances of the feature edge to the input feature (#7532) 
## Summary of Changes

Fixes issue #5110.
Adds a edge_distance criteria to the mesh generation process.
This criteria is an upper bound for the distance from the edge to the 1D
feature.

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): fix #5110
* Link to small feature page :
[Mesh_3_edge_distance_criteria](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Mesh_3_edge_distance_criteria)
* Link to compiled documentation
[*here*](https://cgal.github.io/7532/v1/Manual/index.html):
*
[Mesh_edge_criteria_3](https://cgal.github.io/7532/v1/Mesh_3/classCGAL_1_1Mesh__edge__criteria__3.html)
  * [Mesh_criteria_3](https://cgal.github.io/7532/v1/Mesh_3)
 2024-05-27 10:58:15 +02:00
Sebastien Loriot 596fa09e20
Kinetic Shape Partition (#7198) 
PR for Kinetic Partitioning and Reconstruction feature.

* Affected package(s): Kinetic Partitioning and Reconstruction
* Issue(s) solved (if any): 
* Feature/Small Feature (if any):
[link](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Kinetic_Shape_Partition_3)
* Link to compiled documentation:
[link](https://cgal.github.io/7198/v0/Manual/packages.html#PkgKineticSpacePartition)
* License and copyright ownership:  GeometryFactory/Inria

**TODO:**
- [x] check branch size (for @sloriot)
 2024-05-26 17:51:49 +02:00
Sébastien Loriot ddbd2e6818 Merge remote-tracking branch 'cgal/master' 2024-05-24 14:18:24 +02:00
Laurent Rineau 0c0b22ba92 add tests and assertions for the timestamper 2024-05-23 16:35:54 +02:00
Laurent Rineau 6160887748 fix warning 
```
include\CGAL/Compact_container.h(443): warning C4101: 'ts': unreferenced local variable
```

https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-Ic-248/Minkowski_sum_2/TestReport_Christo_MSVC2017-Debug-64bits.gz
 2024-05-22 12:22:56 +02:00
Laurent Rineau 70464ea107 Merge remote-tracking branch 'afabri/STL_extension-Fix_Prevent_deref-GF' into pr/lrineau/8170 2024-05-21 18:55:11 +02:00
Laurent Rineau 797c056577 Prevent_deref, major changes 
Now the second parameter is the `reference` type and no longer the `value_type`.
 2024-05-21 08:53:48 +02:00
Laurent Rineau e96aaf37ad Merge branch 'master' into pr/afabri/7410 2024-05-17 23:03:55 +02:00
Laurent Rineau e9fb0190c3 Merge pull request #7373 from sloriot/Kernel-Perfect_forwarding 
Add some perfect forwarding in the Kernel
 2024-05-15 16:12:23 +02:00
Andreas Fabri 008752cedc Use macro CGAL_NO_UNIQUE_ADDRESS 2024-05-13 11:01:36 +01:00
Andreas Fabri ffc5541ce7 CGAL_USE 2024-05-13 10:50:50 +01:00
ange-clement 8575f53583 Doc upgrades + simplified initial_points_generator parameter + fixed memory leaks 2024-05-02 17:29:23 +02:00
ange-clement 50dfc18d4a Merge branch 'Mesh-3-rework-make-mesh-point-initialization-2-aclement' of https://github.com/ange-clement/cgal into Mesh-3-rework-make-mesh-point-initialization-2-aclement 2024-05-02 17:19:57 +02:00
ange-clement fa6e044414 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-rework-make-mesh-point-initialization-2-aclement 2024-05-02 14:47:50 +02:00
Andreas Fabri 10e9de8e04 Move CGAL_USE(1) 2024-04-30 09:29:30 +01:00
Laurent Rineau 0095302f2d fix the test for buggy MSVC 2017 2024-04-30 10:18:45 +02:00
Laurent Rineau 9db8b7f17b remove extra include 2024-04-26 16:41:01 +02:00
Laurent Rineau d9d5a02375 fix CC time_stamper 2024-04-26 16:39:01 +02:00
Laurent Rineau 488668b54b remove less_cpp14 2024-04-26 16:38:09 +02:00
Laurent Rineau 33c3d22bf8 simpler timestamp system 2024-04-26 16:36:39 +02:00
Laurent Rineau ec1d97bea9 fix the timestamp system 2024-04-26 16:36:39 +02:00
Laurent Rineau ce58f38b76 move With_point_and_info_tag to Compact_container.h 2024-04-26 16:36:33 +02:00
Laurent Rineau 4d95e4c987 fix a compilation error with C++<20 2024-04-26 16:35:21 +02:00
Laurent Rineau 11402dfeb9 Add With_offset_tag 2024-04-26 16:35:14 +02:00
Laurent Rineau 69aa7b878b use using instead of typedef (and use base cstr) 2024-04-26 16:34:00 +02:00
Laurent Rineau 7579026503 add the last static_assert to the test 2024-04-26 16:31:23 +02:00
Andreas Fabri 3ce808553b Add issue 2024-04-26 16:29:16 +02:00
Laurent Rineau ad30644ed5 add CGAL::Scope_exit 
Example of use:

```c++
    Scope_exit guard{[&] {
      for(auto v : region_vertices) {
        v->clear_mark(Vertex_marker::REGION_BORDER);
        v->clear_mark(Vertex_marker::REGION_INSIDE);
      }
    }};
```

with CTAD, or:

```c++
    auto cleanup_tds_data = make_scope_exit([&] {
      for(auto c : cells) {
        c->tds_data().clear();
      }
    });
```
 2024-04-26 16:10:23 +02:00
Laurent Rineau 4c75012cca oformat(x, tag) passed the tag value to the Output_rep 
That allows to pass an integral offset to the displayed time stamps.

The goal is to set it to -1, to display vertices IDs that are identical
to the input vertices indices of the `Surface_mesh``.
 2024-04-26 13:29:31 +02:00
Laurent Rineau 952d34c6ea cosmetic changes (indent, spaces, naming) 2024-04-26 13:09:05 +02:00
Andreas Fabri 53b438eeeb STL_extension: Add parameter for value type to Prevent_deref 2024-04-26 13:08:06 +02:00
Laurent Rineau 98f1e53020 Improve I/O 
- `IO::oformat` can display triangulations vertex handles
  with point, using `With_point_tag{}` as second argument,

- improve the compatibility with C++20 `<format>`: now the precision
  can be specified in the format string.

Backport: master
 2024-04-26 12:05:08 +02:00
Laurent Rineau 15349f0bda simplify the code for MSVC 2017 (compiler bug_ 2024-04-26 10:39:41 +02:00
Laurent Rineau 5eeeb649e0 remove CGAL::cpp17, useless now that CGAL requires C++17 2024-04-25 09:17:57 +02:00
Laurent Rineau 0fa27bc857 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-04-24 16:51:27 +02:00
Laurent Rineau f305159a26 Merge remote-tracking branch 'cgal/master' into pr/sloriot/7373 2024-04-23 14:37:29 +02:00
Laurent Rineau 940a7ebe9f fix make_array with is_convertible_without_narrowing 2024-04-23 14:29:33 +02:00
Laurent Rineau ca1f11d715 Add CGAL::is_convertible_without_narrowing 
... and `CGAL::cpp20::type_identity`.
 2024-04-23 13:33:07 +02:00
Laurent Rineau aad04f71d3 fix CC time_stamper 2024-04-22 14:23:24 +02:00
Laurent Rineau 2bb3f9a0d3 make_array is not useful here 2024-04-19 17:24:24 +02:00
Laurent Rineau 736ab7a555 make_array now use perfect forwarding, and remove fwd_make_array 2024-04-19 16:47:47 +02:00
Laurent Rineau 4206382ac7 fix the doc 2024-04-19 16:46:26 +02:00
Jane Tournois c19be601fc Merge remote-tracking branch 'cgal/master' into Mesh-3-edge-distance-criterium-aclement 2024-04-16 14:39:43 +01:00
Laurent Rineau 561256ee0b use override instead of virtual 2024-04-15 15:37:12 +02:00
Laurent Rineau 8250d8636a add CGAL::Scope_exit 
Example of use:

```c++
    Scope_exit guard{[&] {
      for(auto v : region_vertices) {
        v->clear_mark(Vertex_marker::REGION_BORDER);
        v->clear_mark(Vertex_marker::REGION_INSIDE);
      }
    }};
```

with CTAD, or:

```c++
    auto cleanup_tds_data = make_scope_exit([&] {
      for(auto c : cells) {
        c->tds_data().clear();
      }
    });
```
 2024-04-11 17:38:48 +02:00
Laurent Rineau d02457a9a5 make_sorted_pair, for any aggregate with 2 members 2024-04-10 11:57:33 +02:00
Jane Tournois 61d4de64b0 Merge remote-tracking branch 'cgal/master' into Tet_remeshing-with_sizing_field-jtournois 2024-04-09 12:45:48 +01:00
Sébastien Loriot f2a2051911 do not use deprecated include path 2024-04-05 19:00:01 +02:00
ange-clement da690fda11 Fixed warning unused variables 2024-04-05 11:09:33 +02:00
ange-clement 5b0f1fc4c2 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-rework-make-mesh-point-initialization-2-aclement 2024-03-29 16:46:24 +01:00
ange-clement e64e28d5ef Made initial_point parameter work with any Range 
With doc and example (
 example "mesh_3D_image_with_initial_points.cpp" has been renamed to  "mesh_3D_image_with_image_initialization.cpp")
 2024-03-29 16:29:07 +01:00
ange-clement 3cfea618e5 as in PR #7844, removed _sizing_field parameter for edge_distance. 2024-03-28 11:39:33 +01:00
ange-clement 70fd9113e7 Merge branch 'master' of https://github.com/CGAL/cgal into Mesh-3-edge-distance-criterium-aclement 2024-03-28 11:36:39 +01:00
hoskillua 916e5f55c5 Making PostProcessing QEM Optional (np) 2024-03-28 11:45:44 +02:00
Laurent Rineau 1926ffd619 Merge remote-tracking branch 'cgal/master' into Kernel-Perfect_forwarding 2024-03-27 17:00:45 +01:00
Laurent Rineau 87bc0c8ad1 C++17 is now required since CGAL-6.0 2024-03-27 11:05:41 +01:00
Sven Oesau 490c99f32b Merge remote-tracking branch 'cgal/master' into Kinetic_shape_reconstruction-new_package-soesau 2024-03-26 17:29:04 +01:00
Sébastien Loriot 38339b7e4e Merge remote-tracking branch 'cgal/master' into HEAD 2024-03-25 16:14:08 +01:00
Mael Rouxel-Labbé 89a5d30069 Fix template parameter of specialization + const correctness 2024-02-27 15:55:18 +01:00
Mael Rouxel-Labbé d6240a6098 Add name parameter for Isosurfacing_3 2024-02-23 10:41:02 +01:00
Laurent Rineau b112f2db75 simpler timestamp system 2024-02-22 13:40:58 +01:00
Laurent Rineau 971082296c fix the timestamp system 2024-02-21 12:07:55 +01:00
Laurent Rineau 4bef1ac665 move With_point_and_info_tag to Compact_container.h 2024-02-13 13:04:13 +01:00
Jane Tournois b48760af26 use do_not_triangulate_faces 
a NP that already existed before this PR
 2024-02-12 17:08:46 +01:00
Jane Tournois 6ed6aa681a improve add_bbox using make_hexahedron and Iso_cuboid_3 2024-02-12 16:32:52 +01:00
Laurent Rineau f984af0a6c fix a compilation error with C++<20 2024-01-22 23:03:53 +01:00
Laurent Rineau 73c5a2cf5f Add With_offset_tag 2024-01-16 15:27:48 +01:00
Laurent Rineau f753446633 oformat(x, tag) passed the tag value to the Output_rep 
That allows to pass an integral offset to the displayed time stamps.

The goal is to set it to -1, to display vertices IDs that are identical to the input vertices indices of `the Surface_mesh`.
 2024-01-15 09:45:25 +01:00
Mael Rouxel-Labbé d483b3bdfd Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-01-09 13:52:46 +01:00
Laurent Rineau 06288f3f04 improve the code reproducibility 2024-01-05 16:38:53 +01:00
Jane Tournois 9e69592328 Merge remote-tracking branch 'cgal/master' into Tet_remeshing-wip-jtournois 2024-01-04 09:28:51 +00:00
Jane Tournois c315deec6e Merge branch 'Tet_remeshing-with_sizing_field-jtournois' into Tet_remeshing-wip-jtournois 
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp
#	Tetrahedral_remeshing/doc/Tetrahedral_remeshing/examples.txt
#	Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h
#	Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h
 2024-01-04 10:25:54 +01:00
Sebastien Loriot caecbe29c7
Replace boost::mpl (#7813) 
- `boost::mpl::if_` --> `std::conditional`
- `boost::enable_if` -> `std::enable_if`
- `boost::mpl::and_` -> `&&`
- `boost::mpl::or_` -> `||`
- `boost::constant::bool_` -> `std::bool_constant`
- ...
 2023-12-26 17:33:36 +01:00
Laurent Rineau 9a944e563c Merge remote-tracking branch 'cgal/master' into PMP-BF_autorefine 
# Conflicts:
#	Installation/CHANGES.md
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
 2023-12-13 15:57:30 +01:00
Laurent Rineau 222fafc411 Merge pull request #7805 from MaelRL/AW3-Resume_aw3-GF 
Alpha wrapping: re-use and resume functionalities
 2023-12-11 13:56:29 +01:00