Commit Graph

798 Commits

Author SHA1 Message Date
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Mael Rouxel-Labbé ac86fadd7a Misc code formatting improvements 2019-11-19 12:51:17 +01:00
Andreas Fabri d6a89652a1 CGAL:: Add Parallel_if_available_tag 2019-11-15 13:48:46 +01:00
Laurent Rineau e10ace6bcf Merge pull request #4334 from sloriot/CGAL-SPDX_cleanup_fixes
Fix some remaining license notice + add a missing LicenseRef-Commercial
2019-11-06 17:45:23 +01:00
Sébastien Loriot 56b828d118 add missing include directive 2019-11-05 09:07:34 +01:00
Sébastien Loriot 9a0bff4008 remove BOOST_FOREACH added by recent PRs 2019-11-04 10:59:15 +01:00
Sébastien Loriot bff5db68e1 fix some remaining license notice + add a missing LicenseRef-Commercial 2019-10-31 14:17:20 +01:00
Mael Rouxel-Labbé 53d4c9b580 Simplify 'Hash_handles_with_or_without_timestamps' (use 'Get_time_stamper') 2019-10-28 11:29:08 +01:00
Simon Giraudot c43c6ac2fa Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin 2019-10-22 13:21:53 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +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 e81a805cf6 Merge pull request #4278 from sloriot/AOS_2-Trapezoid_map_fixes
Trapezoid map fixes
2019-10-15 16:33:29 +02:00
Sébastien Loriot 1496de2070 fix reset() function 2019-10-10 13:26:49 +02:00
Sébastien Loriot 153832fbba add a function to reset a Handle 2019-10-09 18:06:30 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11
Remove CGAL_CXX11 macro usage
2019-07-19 16:16:22 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Simon Giraudot b2e723b548 Merge branch 'Faster_dd_spatial_searching-cjamin-backup' into Faster_dd_spatial_searching-cjamin 2019-07-04 13:17:50 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +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
Laurent Rineau 5c2df203b4 Merge pull request #3943 from mglisse/Number_types-expression_templates-glisse
Misc fixes for expression templates
2019-05-23 08:50:17 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Marc Glisse a676b75ca0 Misc fixes for expression templates 2019-05-17 19:48:41 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 0341f602b3 Merge pull request #3896 from lrineau/fix-Wnull-pointer-arithmetic
Fix AppleClang -Wnull-pointer-arithmetic warning with TBB as well
2019-05-06 15:30:18 +02:00
Laurent Rineau e3c717c293 Merge pull request #3896 from lrineau/fix-Wnull-pointer-arithmetic
Fix AppleClang -Wnull-pointer-arithmetic warning with TBB as well
2019-05-06 15:01:55 +02:00
Laurent Rineau 19527dc384 Fix AppleClang -Wnull-pointer-arithmetic warning with TBB as well 2019-05-02 14:36:26 +02:00
Laurent Rineau 149046f8c1
Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-04-29 19:54:03 +04:00
Sebastien Loriot 9fe935c59a
Merge pull request #3849 from maxGimeno/STL_Extension-Fix_dispatch-GF
STL_Extension: Fix Dispatch_output_iterator test
2019-04-23 09:39:57 +02:00
Marc Glisse 2dde8a1ddb Revert "Move Handle."
This reverts commit 80f8788fa4.
2019-04-15 14:51:10 +02:00
Maxime Gimeno 920133b785 Replace to_tuple() by operator std::tuple 2019-04-12 14:29:24 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Maxime Gimeno a7361a3444 Clean-up 2019-04-10 14:08:37 +02:00
Maxime Gimeno 4c3bfb1eed Add a fucntion to_tuple() to the Dispatch_output_iterator and use it in the test to avoid a clang error on old macs 2019-04-10 13:48:04 +02:00
Maxime Gimeno 78db3f646d Solve conflicts 2019-04-09 10:04:44 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau 68f321c58d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-04-08 15:58:27 +02:00
Laurent Rineau f40550fef3 Merge pull request #3824 from lrineau/fix-Wnull-pointer-arithmetic
Fix AppleClang -Wnull-pointer-arithmetic warning
2019-04-08 15:57:34 +02:00
Maxime Gimeno 0cace864cd Protect new code 2019-04-04 16:03:13 +02:00
Maxime Gimeno b1a747b514 Add an conversion operator to tuple into Iterator_range to satisfy all versions of clang. 2019-04-04 15:54:07 +02:00
Laurent Rineau 34cf27b47e Use std::ptrdiff_t, because the target branch is not C++11
`std::uintptr_t` was introduced by C++11, but the target branch if
CGAL-4.13-branch, does not require C++11.
2019-04-03 14:56:21 +02:00
Laurent Rineau 68f6ebf42d More reinterpret_cast to avoid undefined behavior 2019-04-03 14:52:12 +02:00
Laurent Rineau c54e7c974b Fix AppleClang -Wnull-pointer-arithmetic warning 2019-04-02 10:29:01 +02:00
Sébastien Loriot 1c119aec44 replace cpp11::unordered_FOO by std::unordered_FOO 2019-03-29 13:28:33 +01:00
Sébastien Loriot 5a30e88a92 replace cpp11::function by std::function 2019-03-29 13:28:33 +01:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot ffce89c0c0 replace cpp11::is_enum by std::is_enum 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01: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 3cfbccd44a remove workaround c++11 features in STL_extension 2019-03-29 10:41:49 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Marc Glisse 5826d192cc Move helper to STL_Extension 2019-02-13 14:29:25 +01:00
Marc Glisse 80f8788fa4 Move Handle.
Probably useless, but it can't hurt.
2019-02-10 17:49:13 +01:00
Andreas Fabri b84f54a9e3 Do not define the macro CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS for VC2013 as suggested in Issue #3436 2019-02-08 09:46:18 +01:00
Andreas Fabri 9d77454b27 Fix needed for VC2013 2019-02-08 08:17:00 +01:00
Laurent Rineau 8d558dc05f Fix the warning about operator= 2019-02-07 17:45:31 +01:00
Andreas Fabri c548eee5c7 Fix STL_Extension 2019-01-28 08:28:17 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Laurent Rineau f83053c2a5 Merge pull request #3602 from afabri/CGAL-VC2017_AVX_workarounds-GF
Fix for VC2017 with /arch:AVX
2019-01-22 09:14:57 +01:00
Laurent Rineau c31be39bb5 Merge pull request #3602 from afabri/CGAL-VC2017_AVX_workarounds-GF
Fix for VC2017 with /arch:AVX
2019-01-22 09:13:14 +01:00
Laurent Rineau 80717c6f41 Merge pull request #3406 from mglisse/cgal-public-dev/Number_types-boost_mp-glisse-2
Support Boost.Multiprecision
2019-01-18 16:37:49 +01:00
Andreas Fabri 13a77a74b0 Fix for Polytope_distance 2019-01-18 11:43:22 +01:00
Andreas Fabri 608c5c6ac8 Fix Seam_mesh and Dispatch_output_iterator 2019-01-09 17:43:45 +01:00
Sébastien Loriot cd7ae286fe fix warning in a probably not acceptable way
warnings trigger when compiling:
 - skin_surface_subdiv
 - skin_surface_subdiv_with_normals
 - union_of_balls_subdiv
 - nef_2_polylines

This comes from a call in the incremental builder
to `current_face = decorator.faces_push_back( Face());`
in `begin_facet()`
2018-11-24 13:42:07 +01:00
Sébastien Loriot d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
PMP: repair polygon soup
2018-11-02 10:37: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
Marc Glisse ab04858562 Remove assumption in QP_solver that BigInt(double) is implicit.
Many complicated functors all over the place, I'll be lucky if I didn't
break at least one...
2018-10-15 15:42:56 +02:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Laurent Rineau 3a8aee198d Concurrent_compact_container uses Time_stamper
- and remove the `CCC_iterator`, in favor of a generic `CC_iterator`.
2018-10-03 17:34:38 +02:00
Laurent Rineau 8993817d9d Time_stamper uses an atomic counter 2018-10-03 17:33:45 +02:00
Mael Rouxel-Labbé e994e2b668 Added SPDX license identifier 2018-08-03 16:28:38 +02:00
Clement Jamin 459ff9a9b4 Introduce CGAL_GENERATE_MEMBER_DETECTOR macro 2018-08-03 11:05:45 +02:00
Sébastien Loriot 62a8391fde Merge pull request #3242 from lrineau/Mesh_3-fix__add_stop_with_TBB-GF
Mesh 3 fix: add the possibility to stop the algorithm, when Parallel_tag is used
2018-07-25 18:59:46 +02:00
Laurent Rineau 95f93026f2 Fix Concurrent_compact_container::merge
The bug was detected by the testsuite.
2018-07-24 12:40:19 +02:00
Laurent Rineau bcce26f2b5 Access to the "current" size of the compact container 2018-07-24 12:40:18 +02:00
Laurent Rineau 4710e1f93d Fix the conflict between <CGAL/atomic.h> and <CGAL/thread.h>
Before this commit, they were both defining
`CGAL::cpp11::atomic`. Now, `<CGAL/thread.h>` includes
`<CGAL/atomic.h>`, and it only defined `CGAL::cpp11::atomic`, using
the TBB implementation, if `CGAL_NO_ATOMIC` was defined by
`<CGAL/atomic.h>`.

@sgiraudot Please have a look.
2018-07-23 15:45:44 +02:00
Laurent Rineau ed034a53be Fix Concurrent_compact_container::merge
The bug was detected by the testsuite.
2018-07-23 10:23:28 +02:00
Laurent Rineau 2836828d61 Access to the "current" size of the compact container 2018-07-18 18:47:15 +02:00
Laurent Rineau 10a84aa34e Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-27 10:33:24 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF
Point Set Processing: Callbacks
2018-06-27 10:21:40 +02:00
Mael Rouxel-Labbé 7490f34560 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-21 10:15:25 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Simon Giraudot 96dcfc070d Fix multiple definitions by making sleep_for() inline 2018-06-20 08:34:18 +02:00
Simon Giraudot 41a7c25942 Force inclusion of <thread> if TBB does not define it 2018-06-19 10:06:37 +02:00
Simon Giraudot c0e79003fc Provide a more generic cpp11::sleep_for() function that handles TBB/STD/MSVC2013 specificities 2018-06-18 16:05:18 +02:00
Laurent Rineau 5fbe760de9 Merge pull request #3149 from afabri/Mesh_3-boost_pp_warning-GF
Mesh_3: Suppress warning concerning boost/preprocessor
2018-06-14 17:40:28 +02:00
Mael Rouxel-Labbé 1cfb9e48ed Renamed include guard 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 49c6878098 Use CGAL::iterator
(this is mostly a revert of e24a089ae8 to replace
boost:: by CGAL::)
2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 0c96d06fc3 Removed usage of CGAL::iterator from join iterators
They define (almost) all the typedefs in the class anyway

Also use result_of() to deduce the result type instead of assuming
that a typedef 'result_type' will be present.
2018-06-13 15:28:52 +02:00
Mael Rouxel-Labbé d70c344a89 Fixed tiny bugs in doc & code of join iterators 2018-06-13 15:28:52 +02:00
Mael Rouxel-Labbé ddeb4c0cd7 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-07 15:14:19 +02:00
Andreas Fabri 9be7c9d897 Fix it for boost 1_65_1. Before it only dealt with boost 1_67_0 2018-06-06 09:42:44 +01:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00