Commit Graph

1312 Commits

Author SHA1 Message Date
Sébastien Loriot c5af2b25f3 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-22 13:27:29 +02:00
Sébastien Loriot 157bdbda08 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-22 13:26:52 +02:00
Guillaume Damiand 74d89220e2 Remove warnings 2020-04-20 15:25:40 +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
Jane Tournois 9a722c4ef1
Merge branch 'master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF 2020-04-20 06:40:24 +02:00
Mael bbd24f2946
Fix missing include 2020-04-16 19:46:09 +02:00
Mael 4fb633a6be
Add missing include 2020-04-16 18:59:54 +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 60cb33fa31 Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF 2020-04-16 17:02:19 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Sébastien Loriot d845d6ce8d Merge remote-tracking branch 'cgal/master' 2020-04-10 18:16:18 +02:00
Sébastien Loriot 2876ad9af1 remove trailing whitespaces 2020-04-10 18:15:32 +02:00
Mael Rouxel-Labbé c16c1a7ea3 Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-04-10 16:10:11 +02:00
Jeff Trull 8b21a67508 Forward declare class template Instead of including a new header 2020-04-07 14:50:17 -07:00
Jeff Trull 905dabc3a2 Fix reference-to-null-pointer UB
Hash compact_container iterators directly from their underlying
pointers, rather than taking the address of their dereferenced objects
2020-04-07 14:47:58 -07: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
rathod-sahaab dbbee667af replaced throw() with noexcept 2020-04-02 18:31:00 +05:30
Jane Tournois a1b292e805 Merge remote-tracking branch 'cgal/master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF 2020-04-01 13:52:57 +01:00
Andreas Fabri 6ae64e7a73 Make functor a template parameter in the internal function 2020-03-27 16:41:53 +01:00
Sébastien Loriot 822bc55640 extra run of the script to remove tabs and trailing whitespaces 2020-03-27 08:28:48 +01:00
Sébastien Loriot 5c5d445eb3 Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:27:43 +01: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 97e46accad extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:26:37 +01:00
Sébastien Loriot 34ce87be56 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:26:15 +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 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +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
Simon Giraudot 63c1090c04 Upate test_for_each 2020-03-23 13:42:45 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Simon Giraudot 320876ab23 Replace exception by return value to stop for_each loops 2020-03-23 08:29:08 +01:00
Sébastien Loriot 2a13c8cbec Update from master 2020-03-20 09:05:58 +01:00
Simon Giraudot c8aa0c8f57 Prevent from testing Parallel_tag if TBB is not here 2020-03-19 15:54:53 +01:00
Simon Giraudot 16625cda01 Fix for_each and add a comment on what it does 2020-03-19 10:38:58 +01:00
Simon Giraudot 61d331f456 Fix for_each 2020-03-18 09:11:41 +01:00
Simon Giraudot c4e62d70e8 Remove K parameter and update doc from reviews 2020-03-17 12:04:44 +01:00
Guillaume Damiand 650a7dcbc2
Merge branch 'master' into Kernel_23-Epeck_objects_in_Compact_container-lrineau_gdamiand 2020-03-16 16:24:54 +01:00
Mael Rouxel-Labbé 100304667d Remove CGAL::internal::boost_::function_property_map
This file was duplicated from BOOST 1.64 because it appeared in a boost
release that was younger than the oldest boost release supported by CGAL
when the file was first required.

The minimum boost version (1.57) now required by CGAL is younger
than the version in which the file appeared in boost (1.51)
and it can thus be removed.
2020-03-12 20:58:44 +01:00
Laurent Rineau 1eba82246e Rule of zero for CC_iterator
This commit is the one fixing the mis-compilation by MSVC 2015.
2020-03-09 17:35:52 +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 fbf790637e Patch for MSVC and clang 2020-03-09 16:32:26 +01:00
Mael Rouxel-Labbé 0133e9f2f9 Merge branch 'PMP-soup_to_mesh_add_vpm-old' into PMP-soup_to_mesh_add_vpm 2020-03-06 11:41:31 +01:00
Laurent Rineau 0dfd416395 Use [[noreturn]] directly 2020-03-06 09:26:54 +01:00
Simon Giraudot b2db69f8f1 Fix license 2020-03-05 14:36:38 +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 e3d7f7946d CC_iterator(CC_iterator&&) is now `= default`
That fixes a segmentation fault with Visual Studio in Skin Surface
Meshing.
2020-02-28 14:01:54 +01:00
Marc Glisse 3e4c0d28e5 More swaps. 2020-02-25 01:29:48 +01:00
Mael Rouxel-Labbé 752fc00bf4 Fix includes 2020-02-20 12:14:40 +01:00
Mael Rouxel-Labbé 3bbc07ebf5 Regroup some helpers to call reserve/resize on containers that do not offer it
Useful because sometimes models of the range concepts we demand
do not offer reserve or resize, yet we still want to call it
when it's available.
2020-02-20 11:16:54 +01:00
Laurent Rineau 0c40f7a458 "Fix" for dumb MSVC compilers
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-77/Triangulation_2/TestReport_afabri_x64_Cygwin-Windows10_MSVC2015-Debug-64bits.gz

My guess is that the compiler short-circuits `Const &&` when the
argument `Const` is `false`, and then the expression `Const &&
!OtherConst` is no-longer dependent on the argument `OtherConst`.

That "fix" just turn `Const &&  !OtherConst` to `!OtherConst && Const`.
2020-02-19 16:27:10 +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 0f0a0ed82d Try to enable the use of Lazy objects in Compact_container 2020-02-12 09:59:51 +01:00
Marc Glisse 6c65f5d929 Some noexcept, swap, etc to help Handle* types 2020-02-12 09:42:51 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +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
Laurent Rineau 315a0b54d1 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:27:53 +01:00
Maxime Gimeno 35600534f0 fixes 2020-01-21 10:05:19 +01:00
Maxime Gimeno e3a20071a1 Fix call to compare_exchange_strong() in Spatial_lock_grid_3.h 2020-01-14 15:50:32 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Sebastien Loriot 6367f5e9cb
Merge pull request #4401 from fritzm/set-error-handler-fix
Fix set_error_handler() header-only-mode issue (#4400)
2019-12-20 09:53:57 +01:00
Fritz Mueller 01f69b5e9d Fix set_error_handler() header-only-mode issue (#4400) 2019-12-20 09:53:22 +01:00
Sébastien Loriot 87d2d83703 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:24:41 +01:00
Sebastien Loriot f4317d4d7f
Merge pull request #4372 from MaelRL/CGAL-clean_obsolete_doc-GF
Doc: Remove some obsolete links
2019-12-20 09:18:37 +01:00
Laurent Rineau 674627937c Merge pull request #4389 from lrineau/DT_3-issue4388-GF
Fix  DT3 parallel performance loss (issue #4388)
2019-12-17 09:16:52 +01:00
Laurent Rineau b826770302 Merge pull request #4397 from afabri/T3_accelerate_insert_in_hole
Triangulation_3: Accelerate point insertion
2019-12-17 09:16:35 +01:00
Laurent Rineau de1074426b Merge pull request #4389 from lrineau/DT_3-issue4388-GF
Fix  DT3 parallel performance loss (issue #4388)
2019-12-17 09:15:48 +01:00
Laurent Rineau 0460176a2b Fix another warning 2019-12-10 13:52:33 +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 29a4f441c9 Shift depends on sizeof(T) not on sizeof(T*) 2019-12-10 12:45:23 +01:00
Laurent Rineau 435bb4d4c4 Cleanup the patch 2019-12-10 10:59:13 +01:00
Mael 40f747bd45 Fix license 2019-12-10 10:20:14 +01:00
Andreas Fabri 35fa824216 Move hash 2019-12-10 10:20:14 +01:00
Andreas Fabri 2edab88f81 variable must be constexpr too 2019-12-10 10:20:14 +01:00
Andreas Fabri 02e3d25914 cleanup 2019-12-10 10:20:14 +01:00
Andreas Fabri 27a93fc25a First cleanup 2019-12-10 10:19:07 +01:00
Andreas Fabri febb607934 WIP: Hard coded appromimated hash function 2019-12-10 10:19:07 +01:00
Andreas Fabri 8aa4fc547f Fix counting collisions 2019-12-10 10:19:07 +01:00
Laurent Rineau a93dd81642 Cleanup 2019-12-10 10:17:08 +01:00
Andreas Fabri 3fd81fc4f2 Split freelist and occupied (todo: save memory) 2019-12-10 10:17:08 +01:00
Andreas Fabri 6462016ce3 Use an unordered map to find neighbor cells 2019-12-10 10:17:03 +01:00
Fritz Mueller 643c8f70d0 Fix set_error_handler() header-only-mode issue (#4400) 2019-12-08 01:25:41 -08:00
Laurent Rineau 04e007a3bf Merge pull request #4323 from MaelRL/STL-Simplify_hash_functor-GF
STL Extension:  Simplify 'Hash_handles_with_or_without_timestamps'
2019-12-05 11:05:20 +01:00
Laurent Rineau e9f1cb405f Improvement for set_size 2019-12-04 15:43:01 +01:00
Laurent Rineau 6cdd833e13 Merge branch 'DT_3-issue4388__for_CGAL-4.14.2-GF' into DT_3-issue4388-GF 2019-12-04 15:39:55 +01:00
Laurent Rineau 6ded244449 Merge branch 'DT_3-issue4388__for_CGAL-4.13.2-GF' into DT_3-issue4388__for_CGAL-4.14.2-GF 2019-12-04 15:32:07 +01:00
Laurent Rineau 3ade506eba Create approximate_size() in Concurrent_compact_container
Instead of having an atomic integer for the size of the compact
container, now all free lists have an atomic integer for their size,
but it is only updated when the size is increased by 10%.
2019-12-04 15:20:52 +01:00
Laurent Rineau 4208951252 revert "Access to the "current" size of the compact container"
Reverts commit 2836828d61
2019-12-04 15:16:25 +01:00
Mael Rouxel-Labbé 57fed1416a Factorize code creating throwing output iterators 2019-12-04 09:10:49 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Mael Rouxel-Labbé 9d2e92ac4c Document the new type 2019-12-03 14:09:48 +01:00
Mael Rouxel-Labbé 7ff2ffb238 Remove some obsolete doc links
Mostly a consequence of using stuff from 'std::' rather than 'CGAL::'
2019-11-20 13:16:40 +01:00
Mael Rouxel-Labbé ac86fadd7a Misc code formatting improvements 2019-11-19 12:51:17 +01:00