Commit Graph

200 Commits

Author SHA1 Message Date
Laurent Rineau 355ca1dbfd Merge pull request #5380 from lrineau/Triangulation_3-compilation_error_if_Parallel_tag_without_TBB-GF
Triangulation_3: Add a static assert so that Parallel_tag can only be used with TBB
2021-03-24 15:05:36 +01:00
Mael Rouxel-Labbé ede18b776c Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2021-03-18 10:42:52 +01:00
Laurent Rineau 8e316f63f7 Replace <boost/type_traits/is_convertible.hpp> by <type_traits> 2021-01-21 11:19:16 +01:00
Laurent Rineau fa6afe73d1 Add a static assert so that Parallel_tag can only be used with TBB 2021-01-21 11:18:27 +01:00
Mael Rouxel-Labbé 723890e388 Misc tiny doc fixes (broken links, grammar, etc.) 2020-12-05 11:49:27 +01:00
Giles Bathgate 1e7ef37b80 Fix uninitialized member in Triangulation_ds_iterators_3.h 2020-11-20 22:59:20 +00:00
Mael Rouxel-Labbé d6f06b9f14 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-11-17 10:24:16 +01:00
Mael Rouxel-Labbé e3c08cf7dc Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-10-19 16:17:27 +02:00
Mael Rouxel-Labbé db1823a470 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-09-22 14:27:09 +02:00
Mael Rouxel-Labbé 643827cd43 Properly document the Cell_data in TDS_3 (add concept CellData) 2020-09-22 14:13:18 +02:00
Mael Rouxel-Labbé 0073c1d6ac Remove dead concept links 2020-09-22 14:13:18 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Laurent Rineau 07eacf5231 Merge pull request #4795 from janetournois/Mesh_3-fix_optimisers_parallel-jtournois
Mesh_3 - fix parallel optimisers
2020-06-30 16:38:05 +02:00
Jane Tournois 13c0719e87 fix incident_edges_threadsafe
internal::Has_member_visited<Vertex>::value is not threadsafe
2020-06-19 13:31:52 +02:00
Jane Tournois 3b8c06f836 fix adjacent_vertices_threadsafe
internal::Has_member_visited<Vertex> is not threadsafe
2020-06-19 13:31:52 +02:00
Jane Tournois ad9c357f33 add adjacent_vertices_threadsafe and use it in nearest_power_vertex() 2020-06-19 13:31:50 +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
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +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
Sébastien Loriot 7c4586be1b Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-05-12 16:59:02 +02:00
Sébastien Loriot fb83386f44 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-05-12 16:58:32 +02:00
Laurent Rineau 3951c38637 Fix UBSAN error: do not bind reference to null pointer
Equivalent to #4683
2020-05-04 18:54:19 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Maxime Gimeno ee052cd622 fix test_io_tds_3 2020-04-06 14:09:33 +02:00
Maxime Gimeno b6a5f23e4e remove trailing whitespaces 2020-04-02 15:02:27 +02:00
Maxime Gimeno e02a3fc37e Merge remote-tracking branch 'cgal/master' into TDS-file_input-maxGimeno 2020-04-02 15:00:23 +02:00
Maxime Gimeno 383eb3d147 Merge tag 'master_before_no_tws_nor_tabs' into TDS-file_input-maxGimeno 2020-04-02 14:56:03 +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
Maxime Gimeno 52cf9815e4 Remove free function and fix TDS3 test 2020-02-28 15:33:03 +01:00
Maxime Gimeno a7a768cae9 more doc fixes 2020-02-28 09:09:55 +01:00
Maxime Gimeno 74a38bd616 Fixes in the doc 2020-02-27 11:43:31 +01:00
Maxime Gimeno ddc784db22 Fix doc 2020-02-26 16:16:19 +01:00
Maxime Gimeno 14669c213c Doc 2020-02-26 12:32:05 +01:00
Maxime Gimeno 808606ebe3 Add a test in tds3 2020-02-26 11:36:34 +01:00
Maxime Gimeno 66cd3401f9 Add a generic function in TDS_3 that takes a boolean argument to decide how to take care of the infinite_vertex, and use it in the T3 functions. 2020-02-26 10:57:55 +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 0fd7bbc4ff Merge pull request #4364 from afabri/CGAL-Parallel_if_available_tag
CGAL:: Add Parallel_if_available_tag
2020-02-07 16:25:03 +01:00
Laurent Rineau f7218dadd6 Do not use swap for the move-assignment of TDS_3
We can write the operator easily without swap.
2020-01-31 14:19:49 +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 3b564a20f8 Add move-semantic to TDS_3 2020-01-31 12:01:43 +01:00
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +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
Maxime Gimeno 2bfdc8398f Move the file_input.h file to Triangulation_3 and write some doc. Unify with the API of copy_tds() and adapt the c3t3_io plugin. 2020-01-08 16:37:39 +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é 6e69d886e3 Don't duplicate code between TDSVertex/Cell and TDS3::Vertex/Cell 2019-12-30 18:31:02 +01:00
Mael Rouxel-Labbé 801187c642 Clean some tests 2019-12-30 18:30:28 +01:00
Mael Rouxel-Labbé efcb6c5378 Fix documentation of tds_data
tds_data is required from TDS3::Cell, not by a model of the cell base
of CGAL::T_D_S_3 (the model of TDS3).

It also must properly document its API.
2019-12-30 18:29:03 +01:00
Mael Rouxel-Labbé 185e50c250 Fix typo ('TDS2' in the documentation of TDS3) 2019-12-30 18:27:55 +01:00
Mael Rouxel-Labbé 6232c04f71 TriangulationDSVertexBase_3 should refine TDS3::Vertex 2019-12-30 18:27:22 +01:00
Mael Rouxel-Labbé cb7c289766 TriangulationDSCellBase_3 should refine TDS3::Cell 2019-12-30 18:26:35 +01:00
Mael Rouxel-Labbé 0b0e7a7890 Document the Vertex/Cell types in the doc of CGAL::TDS_3 (the model) 2019-12-30 18:25:33 +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
Laurent Rineau 759cb0e4d8 Add an assertion to check that the `unsigned char` is wide enough 2019-12-10 13:52:41 +01:00
Laurent Rineau c08c632fc8 Merge branch 'releases/CGAL-5.0-branch' into T3_accelerate_insert_in_hole-rebased 2019-12-10 13:02:24 +01:00
Andreas Fabri 3de47e8248 Fix warning 2019-12-10 12:45:02 +01:00
Laurent Rineau 435bb4d4c4 Cleanup the patch 2019-12-10 10:59:13 +01:00
Andreas Fabri 35fa824216 Move hash 2019-12-10 10:20:14 +01:00
Andreas Fabri 7c9ef9c9f2 Move code into TDS_3 and make it work for parallel mode 2019-12-10 10:20:12 +01:00
Andreas Fabri b6ce453fd5 typo 2019-12-09 09:16:03 +01:00
Andreas Fabri 1b2ed599d7 Unify template parameter names and add tpram for TDS_2 2019-11-23 10:20:33 +01:00
Andreas Fabri b0955c9443 Fix typos 2019-11-21 08:59:53 +01:00
Mael Rouxel-Labbé e73b973b62 Use Parallel_if_available_tag to simplify code that used CGAL_LINKED_WITH_TBB 2019-11-20 12:24:54 +01:00
Andreas Fabri 161b358dc2 TDS_3: Cleanup in the documentation 2019-11-14 14:59:00 +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
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +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
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
Andreas Fabri 285cdd5be5 Add more ranges and a testsuite 2019-06-04 10:40:13 +02:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot 2ce16d14b5 remove workaround code for cpp11 in triangulation packages 2019-03-29 10:41:50 +01:00
Laurent Rineau f5836b2206 Merge branch 'releases/CGAL-4.13-branch' 2019-03-07 14:31:16 +01:00
Laurent Rineau 99fe1bc548 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-07 14:26:47 +01:00
Sébastien Loriot 3887a21429 add missing text for brief of advanced class/type/function/concept 2019-03-05 08:01:17 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Andreas Fabri 806ba2ec98 Add operartor= for DT3 2019-01-10 18:29:52 +01:00
Sébastien Loriot 61169b394e Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2019-01-04 17:19:19 +01:00
Mael Rouxel-Labbé b6f6aeb844 Merge remote-tracking branch 'mine/T3-Fix_weighted_ranges_insertion_removal-GF' into T3-Fix_weighted_ranges_insertion_removal-GF 2018-12-18 13:20:58 +01:00
Mael Rouxel-Labbé 82e458da80 Replaced TDS template specialization with tag-based detection 2018-11-14 07:58:08 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name
Update the name of package names reference links
2018-10-29 10:27:53 +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
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00