Commit Graph

957 Commits

Author SHA1 Message Date
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é 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
Laurent Rineau 2acb975ba4 Merge 'cgal/master' to fix conflicts 2019-09-11 14:35:38 +02:00
Laurent Rineau bbf559ee17 Merge remote-tracking branch cgal/master into Triangulation_segment_traverser_3-tvanlank 2019-09-10 19:21:38 +02:00
Laurent Rineau 88a915779f Merge tag 'base2018' into HEAD
# Conflicts:
#	Triangulation_3/examples/Triangulation_3/CMakeLists.txt
#	Triangulation_3/include/CGAL/Triangulation_3.h
#	Triangulation_3/include/CGAL/Triangulation_utils_3.h
2019-09-10 18:41:08 +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
Andreas Fabri 0b972eb950 Suppress warning concerning boost/preprocessor which is included from boost/lexical_cast 2018-06-04 14:06:31 +01:00
Maxime Gimeno 850c9fd576 Try to fix opencv bug with EXIT 2018-05-31 13:57:46 +02:00
Simon Giraudot 6480cf2205 Define a CGAL::cpp11::thread wrapper for TBB or STD 2018-05-29 11:42:04 +02:00
Simon Giraudot 4b7f5bccc4 Only include needed TBB headers 2018-05-29 11:42:03 +02:00
Andreas Fabri daa7ea7899 Fix nested types 2018-05-18 14:18:02 +01:00
Sébastien Loriot 4ceeb92020 add missing semicolon 2018-05-16 08:52:50 +02:00
Andreas Fabri e24a089ae8 The class std::iterator got deprecated. It only served to define some types 2018-05-15 22:26:17 +02:00
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Laurent Rineau 5836b514a1 Merge pull request #3039 from MaelRL/STL-Fix_sneaky_std_unary_function-GF
STL_Extension: Fix a leftover std::unary_function
2018-04-24 17:34:30 +02:00
Andreas Fabri 71e9d62270 Remove file that ws accidentally added 2018-04-23 15:06:21 +01:00
Laurent Rineau 85c91b0cd3
Update hash_openmesh.h 2018-04-20 16:00:27 +00:00
Laurent Rineau b3e75f109a
Update hash_openmesh.h 2018-04-20 15:46:02 +00:00
Mael Rouxel-Labbé 8bad0b5bf5 std::unary_function > CGAL::unary_function 2018-04-20 16:52:45 +02:00
Andreas Fabri 5bc6d78f7f fixes in STL_Extension 2018-04-20 08:53:22 +01:00
Andreas Fabri f0c1d3aab7 more allocator_traits 2018-04-19 14:49:05 +01:00
Andreas Fabri c5cbd4a480 Fix typo; Remove unused typedef 2018-04-18 07:59:57 +01:00
Laurent Rineau 33d3abaf26 Fix compilation errors 2018-04-17 17:15:00 +02:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Andreas Fabri 00ebc78c1d fix #if in assertions.h 2018-04-17 14:45:37 +01:00
Andreas Fabri bc53cd2392 fix #if in assertions.h 2018-04-17 14:19:05 +01:00
Andreas Fabri 1df9441888 Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:54:01 +01:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Andreas Fabri 150dfbbfbc fix reference/const_reference 2018-04-17 07:02:43 +01:00
Andreas Fabri 303b0ab46e Fix detection of CGAL_CXX11 for VC++ and fixes of usage of std::allocator_traits 2018-04-16 11:00:03 +01:00
Andreas Fabri 0cccc34cad Use std::allocator_traits 2018-04-16 08:17:09 +01:00
Andreas Fabri 1734931675 Use std::allocator_traits 2018-04-16 07:02:46 +01:00
Andreas Fabri 2739189ce0 Fix include 2018-04-15 09:37:17 +01:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 2ca99e2655 Qualify with CGAL:: 2018-04-05 08:50:03 +01:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Mael Rouxel-Labbé d9168d011c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 18:24:39 +01:00
Laurent Rineau 85ce0157cf Merge pull request #2839 from afabri/STL_extension-replace_std_iterator-GF
STL_extension: Introduce CGAL::iterator
2018-02-23 17:34:57 +01:00
Laurent Rineau 758688beba Merge pull request #2837 from afabri/CGAL-no_return-GF
Define CGAL_NORETURN also for VC++
2018-02-23 17:34:41 +01:00
Mael Rouxel-Labbé c28e05be0c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 12:50:06 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Laurent Rineau 95950ceeeb Merge pull request #2825 from afabri/STL_extension-fix_vector_iterator-GF
STL_extension:  Fix #2587 concerning &*
2018-02-19 14:26:57 +01:00
Mael Rouxel-Labbé b34bbbc918
Fix namespace for iterator_traits 2018-02-15 18:20:38 +01:00
Laurent Rineau 474a8a3658
Reformat 2018-02-14 21:07:56 +01:00
Andreas Fabri 52549b1145 STL_extension: Introduce CGAL::iterator as replacement for the deprecated std::iterator 2018-02-14 18:46:45 +00:00
Andreas Fabri bcbbf35dad Define CGAL_NORETURN also for VC++ and move the macro before the functions 2018-02-14 14:51:40 +00:00
Laurent Rineau 43c88bf260 Merge pull request #2817 from lrineau/STL_Extensions-cpp17_uncaught_exceptions-GF
Use std::uncaught_exceptions() when available
2018-02-14 15:33:40 +01:00
Andreas Fabri 91e1cd7faa STL_extension: Fix #2587 concerning &* applied to a CGAL::internal::vector_iterator 2018-02-13 13:27:56 +00:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Laurent Rineau ce09744a4a Use std::uncaught_exceptions() when available
That should fix the following warning.
```
[ 50%] Building CXX object CMakeFiles/dynamic_properties_test.dir/dynamic_properties_test.cpp.o
/usr/local/bin/c++   -DCGAL_TEST_SUITE=1 -DCGAL_USE_GMP -DCGAL_USE_MPFR -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Property_map/../../include -isystem /usr/include/x86_64-linux-gnu -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Property_map -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/include -I/mnt/testsuite/include  -DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z -frounding-math   -Wall -frounding-math -o CMakeFiles/dynamic_properties_test.dir/dynamic_properties_test.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Property_map/dynamic_properties_test.cpp
In file included from /mnt/testsuite/include/CGAL/basic.h:43,
                 from /mnt/testsuite/include/CGAL/Cartesian/Cartesian_base.h:29,
                 from /mnt/testsuite/include/CGAL/Simple_cartesian.h:29,
                 from /mnt/testsuite/include/CGAL/Exact_predicates_inexact_constructions_kernel.h:29,
                 from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Property_map/dynamic_properties_test.cpp:2:
/mnt/testsuite/include/CGAL/Polyhedron_incremental_builder_3.h: In destructor 'CGAL::Polyhedron_incremental_builder_3<HalfedgeDS_>::~Polyhedron_incremental_builder_3()':
/mnt/testsuite/include/CGAL/assertions.h:104:30: warning: 'bool std::uncaught_exception()' is deprecated [-Wdeprecated-declarations]
    (CGAL::possibly(EX)||std::uncaught_exception()?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
                              ^~~~~~~~~~~~~~~~~~
/mnt/testsuite/include/CGAL/Polyhedron_incremental_builder_3.h:204:9: note: in expansion of macro 'CGAL_destructor_assertion'
         CGAL_destructor_assertion( check_protocoll == 0);
         ^~~~~~~~~~~~~~~~~~~~~~~~~
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-168/Property_map/TestReport_lrineau_Ubuntu-latest-GCC6-CXX1z.gz

Fix #2806.
2018-02-09 18:46:16 +01:00
Andreas Fabri f4ec38e27c STL_extensions 2018-01-18 14:15:21 +00:00
Andreas Fabri 799260f604 Poisson surface reconstruction 2018-01-18 10:05:01 +00:00
Andreas Fabri f76e744bff Spatial_searching 2018-01-17 20:12:06 +00:00
Andreas Fabri 38b2e57b11 PMP 2018-01-17 17:59:35 +00:00
Andreas Fabri 22bd2815a3 Polyhedron 2018-01-17 17:13:53 +00:00
Andreas Fabri 6c791f161a Triangulation_2 2018-01-17 16:12:12 +00:00
Simon Giraudot d1179b5b04 Add cpp11::function (using either std::function or boost::function) 2018-01-12 09:54:14 +01:00
Mael Rouxel-Labbé add23592de Fixed license/tag issues 2017-12-08 10:02:26 +01:00
Mael Rouxel-Labbé 10b096f8b3 Fixed accidentally untracked file 2017-12-08 10:00:08 +01:00
Mael Rouxel-Labbé c18e005cd4 Added a couple of missing tags 2017-12-05 17:20:46 +01:00
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01:00
Sébastien Loriot 04aa045706 add missing identifiers 2017-11-21 13:41:58 +01:00
Clement Jamin 8d71d73dc8 Merge remote-tracking branch 'remotes/cgal/master' into Faster_dd_spatial_searching-cjamin 2017-11-17 10:41:54 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Sébastien Loriot a05b134a6b add SPDX identifier for files under the boost license 2017-11-12 10:17:50 +01:00
Mael Rouxel-Labbé 9c67d36de3 Used 'visited_for_vertex_extractor' to avoid sets 2017-11-10 16:22:03 +01:00
Laurent Rineau d333cc672d Merge pull request #2492 from sloriot/OM-fix_edge_hashing
Fix hashing of edge_descriptor for OpenMesh
2017-10-11 19:18:57 +02:00
Laurent Rineau 107cdccd6d Merge pull request #2438 from lrineau/Mesh_3-test_polyhedral_complex_with_surface_mesh-GF
Mesh_3: make it work with Surface_mesh
2017-10-11 19:14:49 +02:00
Laurent Rineau 3877f84899 Merge pull request #2492 from sloriot/OM-fix_edge_hashing
Fix hashing of edge_descriptor for OpenMesh
2017-10-11 19:11:46 +02:00
Laurent Rineau 2b35bddfb2 Replace all std::binary_function by CGAL::binary_function 2017-10-04 16:36:32 +02:00
Laurent Rineau 05a3370ad3 Rename to <CGAL/functional.h> 2017-10-04 16:32:11 +02:00
Andreas Fabri 106d415a95 Add CGAL:binary_function 2017-10-04 15:09:39 +01:00
Laurent Rineau 23f954af44 Document CGAL::unary_function
`(std|CGAL)::unary_function` is actually quoted in a few CGAL
documentation pages. That is why it must be documented.
2017-10-04 15:57:28 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Andreas Fabri 808c75027c typo 2017-10-04 13:38:43 +01:00
Andreas Fabri 2c2e26f07e Include CGAL/unary_function.h 2017-10-04 13:36:00 +01:00
Sébastien Loriot 12688d05a1 fix hashing of edge_descriptor for OpenMesh 2017-10-03 17:21:24 +02:00
Laurent Rineau 98a5a1911c Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch 2017-09-25 16:46:13 +02:00
Sébastien Loriot f18cb35d60 introduce cpp11::is_enum to work around a bug observed with boost 1.62 2017-09-22 18:27:59 +02:00
Laurent Rineau 9fa470c79f (!) Version that compiles, but does not work with multiple surfaces 2017-09-18 14:56:48 +02:00
Clement Jamin f0a89af33b Merge branch 'Faster_dd_spatial_searching-cjamin-old' into Faster_dd_spatial_searching-cjamin 2017-09-15 11:11:28 +02:00
Simon Giraudot 8d52a9259d Bugfix: do not disable C++11 tuples/variadic with CLANG 2017-07-11 11:58:53 +02:00
Simon Giraudot df5cf3e5b1 Simplify Construct_array and add version for non-variadic compilers 2017-07-11 11:58:49 +02:00
Simon Giraudot 783d643cb6 Add functor Construct_array 2017-07-11 11:58:47 +02:00
Laurent Rineau 80829925b7 Merge pull request #2174 from gdamiand/BGL-LCC-gdamiand
BGL version for Linear_cell_complex_for_combinatorial_map
2017-07-10 15:38:21 +02:00
Mael Rouxel-Labbé a931a03094 Copied Boost's function_property_map.hpp to /STL_Extension
This proprety map was introduced in a release that is younger than the oldest
release CGAL supports --> copy it to always have it.
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 2f519b0945 Removed unnecessary semi colon 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 98226c97c4 Added a template parameter to Regular_tr_cell_base on hidden points handling
Before WP<->P implicit conversion changes, one could choose to not keep hidden
points by using `Triangulation_cell_base_3` as cell base instead of
`Regular_triangulation_cell_base_3`. This is not possible anymore as point types
will conflict.

This changes introduces a new template parameter to pass a policy on whether
to keep or discard hidden points.

It is a breaking change since it is placed before the container template
parameter, but it makes more sense that way and the container type template
was not documented.
2017-06-28 10:14:35 +02:00
Guillaume Damiand 013f447395 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-22 23:21:39 +02:00
Laurent Rineau 5bff696740 Try to fix the segfault
See https://github.com/CGAL/cgal/pull/2072#issuecomment-304310586
2017-06-19 10:34:05 +02:00
Laurent Rineau 07ed1e08a3 Merge pull request #2143 from afabri/Mesh_3-mesh_polyhedral_domain_with_surface_inside-GF
Mesh_3: Add an example (polyhedron inside a bouding polyhedron) in the User Manual
2017-06-16 12:07:13 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Clement Jamin ce60cf420f Add a comment about BOOST_TTI_HAS_MEMBER_FUNCTION 2017-06-06 11:42:24 +02:00
Laurent Rineau d1221a6eae Try to fix the segfault
See https://github.com/CGAL/cgal/pull/2072#issuecomment-304310586
2017-06-02 18:08:00 +02:00
Laurent Rineau 74640e8893 The time stamp of the default-constructed CC_iterator can not be 0
`0` is a valid time stamp: that is the time stamp of the first created
`Vertex` or `Cell` of the `TDS_3`. Use the maximal `size_t` instead.
2017-05-31 10:24:38 +02:00
Laurent Rineau 31f277dc93 Merge pull request #2072 from janetournois/Mesh_3-improvements-GF
Mesh 3 : small improvements
2017-05-22 10:59:48 +02:00
Clement Jamin efce74597e The macro has moved to Has_member.h 2017-05-18 11:42:04 +02:00
Laurent Rineau 81dccb7d22 Add a macro CGAL_COMPACT_CONTAINER_DEBUG_TIME_STAMP
That macro allows to store the time stamp in the `CC_iterator` (the type
of handle for the triangulation vertices and cells), and check that
handle and pointee have the same time stamp.
2017-05-18 10:57:13 +02:00
Laurent Rineau 6055d226b1 Add an assertion
The assertion checks that two vertex handles have the same time stamp if
and only if they have the same address.
2017-05-18 10:57:13 +02:00
Laurent Rineau e294cd8fe9 Fix new (recycled) time stamps when a TDS is copied 2017-05-18 10:57:13 +02:00
Laurent Rineau 0757cfaeb0 Re-use existing time stamps
When a `Vertex` or a `Cell` is recycled by the `Compact_container`,
re-use the existing time stamp instead of increment it. That will avoid
that the pointee of a handle has a changing timestamp.
2017-05-18 10:57:13 +02:00
Mael Rouxel-Labbé cd2a562ffa Fixed improper guards against the inclusion of deprecated headers 2017-05-16 10:17:41 +02:00
Clement Jamin e3d9db4b94 The macro has moved to Has_member.h 2017-05-03 16:50:05 +02:00
Clement Jamin 2548860ddb Introduce CGAL_GENERATE_MEMBER_DETECTOR macro 2017-05-03 16:47:06 +02:00
Laurent Rineau dce8bb77ba Merge pull request #2053 from cjamin/Mesh_3-code_improvements-cjamin
Mesh_3: code improvements + bug fix
2017-04-14 18:32:05 +02:00
Andreas Fabri 8cbbe0e165 Remove dependencies of Triangulation_3 on Triangulation_2 2017-04-06 11:08:37 +02:00
Guillaume Damiand b375202409 Add a function in compact container to test if a pointer is the first or last element of a block. 2017-03-29 12:45:28 -04:00
Simon Giraudot 025c4e9db1 Fix iterator range size type 2017-03-10 15:28:49 +01:00
Clement Jamin a160851e56 "thread_id" => "thread_priority" 2017-03-09 17:48:50 +01:00
Laurent Rineau 52a2242b60 Merge pull request #1929 from sgiraudot/Point_set_processing-Optimize_grid_simplify-GF
Optimizations for grid simplication
2017-03-02 16:55:08 +01:00
Laurent Rineau 366ddb9513 Merge pull request #1939 from lrineau/Mesh_3-fix_determinism-GF
Fix non-determinism!
2017-03-02 16:54:50 +01:00
Laurent Rineau cb5b3acf98 Class Compare_handles_with_or_without_timestamps to replace hacks
Previously, each file was using its own implementation of the "compare
handle" function object. This commits adds a new class
`Compare_handles_with_or_without_timestamps` that checks the presence of
`Has_timestamp` in the pointed type, and provides a different
`operator()` depending on that.
2017-03-01 12:08:52 +01:00
Simon Giraudot b351ec33da Remove useless backward compat cpp0x 2017-02-27 12:17:46 +01:00
Simon Giraudot 588c8634b9 Add CGAL::cpp11::unordered_set/map using boost or std 2017-02-27 09:56:54 +01:00
Laurent Rineau ff4da475e3 Merge pull request #1650 from afabri/STL_extensions-static-GF
STL_extension: error/warning behavior/handler is not thread safe
2016-11-18 10:58:10 +01:00
Andreas Fabri fe09323aa7 Make the allocator in CGAL::vector not static 2016-11-02 17:47:19 +01:00
Laurent Rineau d5e97c734c Protect another "max" 2016-10-28 14:01:26 +02:00
Jane Tournois fa72bc0f01 replace std::max by (std::max) for windows
same for min
2016-10-27 17:55:40 +02:00
Simon Giraudot bfcacf9312 Bugfix: typo on boost namespace 2016-10-21 10:28:41 +02:00
Simon Giraudot 2a8cd6b466 Fix boost demangle 2016-10-21 10:28:41 +02:00
Laurent Rineau b562718efa Merge pull request #1589 from sloriot/Kernel-boost_apply_visitor_workaround
Workaround a bug in boost 1.58 with c++14
2016-10-20 09:47:54 +02:00
Sébastien Loriot ba6c0758e7 workaround a bug in boost 1.58 with c++14
https://svn.boost.org/trac/boost/ticket/11285
2016-10-18 11:41:32 +02:00
Laurent Rineau 7a84cbceea Merge pull request #1509 from gdamiand/Compact_container-add_debug_function-gdamiand
Add index function in Compact container
2016-10-17 10:01:27 +02:00
Guillaume Damiand f034fe2a92 Move assert; it was at the wrong place. 2016-10-06 08:38:57 -04:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 434cbcf0bb Add missing includes 2016-09-30 15:23:15 +02:00
Laurent Rineau 1aefb3b0f3 include <CGAL/config.h>, not <CGAL/basic.h> 2016-09-30 15:23:14 +02:00
Guillaume Damiand 0cf192cd44 Add index function in Compact container (usefull to debug) 2016-09-28 17:14:07 -04:00
Maxime Gimeno 8469c45336 Enhance Prevent_deref API and use it. 2016-09-28 10:48:07 +02:00
Maxime Gimeno 3eb1f4ca69 Clean-up
- Clean-up
- Moved Prevent_deref to CGAL/iterator.h
2016-09-28 10:45:46 +02:00
Laurent Rineau 331eac693a Merge pull request #1467 from lrineau/STL_Extension-fix_CGAL_static_assertion-lrineau
Always include <boost/static_assert.hpp>
2016-09-16 15:52:34 +02:00
Laurent Rineau 8fe3f26c6f Always include <boost/static_assert.hpp>
If C++11 `static_assert` cannot be used, `BOOST_STATIC_ASSERT` is used
instead *even with `CGAL_NO_ASSERTIONS`*.
2016-09-16 15:25:23 +02:00
Sébastien Loriot 25be975789 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-09-16 13:42:24 +02:00
Sebastien Loriot efd30df215 add missing const 2016-09-15 15:49:02 +02:00
Laurent Rineau ae3285de1b Merge fixes from 'cgal/releases/CGAL-4.8-branch'
> 3466dee Merge pull request #1378 from sloriot/Polyline_simplification_2-handle_undefined_cost
> 7dd7f12 Merge pull request #1448 from afabri/BGL_graph_traits_OpenMesh-GF
2016-09-13 18:29:33 +02:00
Laurent Rineau b97b709a8d Merge pull request #1377 from afabri/BGL-OM_HAS_HASH-GF
hash_value is not defined inside an #ifdef OM_HAS_HASH
2016-09-13 18:11:17 +02:00
Sébastien Loriot 3b583dfc3f if the cost is undefined, remove the element from the queue 2016-08-30 11:34:43 +02:00
Andreas Fabri ad2ec90426 typo 2016-08-30 10:15:15 +02:00
Andreas Fabri 26de0fbb05 hash_value is not defined inside an #ifdef OM_HAS_HASH 2016-08-29 23:25:06 +02:00
Laurent Rineau be8b97eaeb Fix CGAL_NO_ASSERTIONS
- `CGAL_NO_ASSERTIONS` was used *before* it was potentially modified by
the `NDEBUG` macro.

- I have also added a macro `CGAL_DEBUG` that allows to disable `assert`
  but not CGAL assertions, using:

      -DNDEBUG -DCGAL_DEBUG
2016-08-29 19:25:50 +02:00
Laurent Rineau 0c690014b7 Remove all usage of CGAL_LEDA_VERSION
Now, LEDA version >= 6.0 is required if `CGAL_USE_LEDA` is toggled.
2016-08-25 14:38:16 +02:00
Sebastien Loriot 3204aeedf6 simplify empty() 2016-07-06 17:25:57 +02:00
Andreas Fabri 4c78fb44bc Add specializations for the OM handle classes 2016-06-08 10:42:45 +02:00
Andreas Fabri d84be563f8 Add hash_value and specialization of hash for OpenMesh 2016-06-06 19:10:58 +02:00
Andreas Fabri ca6a306815 Rename TimeStamper::key() to hash_value() and let it return a size_t 2016-04-19 17:03:52 +02:00