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

1048 Commits

Author SHA1 Message Date
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +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 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é 4c789c2e8a Fixed typo in comment 2018-06-13 17:30:46 +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é 27eb601598 Added a test for join iterators 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
Laurent Rineau 588cc67897 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF 
Fix some deprecation-related issues
 2018-05-28 13:58:41 +02:00
Laurent Rineau f20743cc20 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF 
Fix some deprecation-related issues
 2018-05-28 11:00:45 +02:00
Mael Rouxel-Labbé b41f1d6272 Various deprecation-related improvements 2018-05-18 16:47:54 +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