Commit Graph

259 Commits

Author SHA1 Message Date
Laurent Rineau 59a0da4f13 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
2021-05-19 17:23:53 +02:00
Maxime Gimeno 3e03d50b8a replace usages of CGAL::cpp11::atomic and thread by std:: calls 2021-05-07 11:10:30 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Sébastien Loriot 350b9172c5 replace %CGAL by \cgal (but in titles) 2021-04-11 14:52:01 +02:00
Laurent Rineau c99be40e7a Merge pull request #5469 from afabri/Box_intersection_d-array-GF
Box_intersection_d:  Replace built-in array with std::array
2021-03-03 17:29:35 +01:00
Andreas Fabri 6b36ea0763 Replace built-in array with std::array 2021-02-18 09:46:41 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé 5bd28b4aea Remove extra backticks on some \tparam 2020-07-29 10:24:47 +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
Maxime Gimeno c74bca8d65 More errors and warnigns 2020-04-23 09:27:26 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02: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
Mael Rouxel-Labbé 8773cee832 Minor code improvements 2020-02-05 10:54:11 +01:00
Mael Rouxel-Labbé 5fdeb06326 Generalize box_d 'divide and conquer' approach to any given integer 2019-12-11 09:52:42 +01:00
Mael Rouxel-Labbé 47585d85b5 Add an additional comment in the doc about parallel box_intersection_d 2019-12-03 16:12:49 +01:00
Mael Rouxel-Labbé b93e556ff3 Document the parallel version of the box_intersection_d 2019-12-03 14:20:24 +01:00
Mael Rouxel-Labbé 82bf0f22f1 Test parallel box_intersection_d and ptr-based box_intersection_d 2019-12-02 15:01:50 +01:00
Mael Rouxel-Labbé d302c56d05 Keep a single version (3 split) of parallel box_intersection_d 2019-12-02 15:01:26 +01:00
Mael Rouxel-Labbé 1e6b42d029 Add a split in 3 box_intersection_d parallel version 2019-11-19 18:40:03 +01:00
Mael Rouxel-Labbé 16350e84a4 Fix bad typedef 2019-11-19 17:12:44 +01:00
Mael Rouxel-Labbé 41bb11cdee Make unique indentation style a little less unique (no real changes) 2019-11-19 17:08:25 +01:00
Mael Rouxel-Labbé 52ce0b6ac4 Change Box_with_info to use the policy ID_EXPLICIT by default
ID_FROM_BOX_ADDRESS does not work when you pass a range of boxes
by value and not by pointers. Since doing that while using
ID_FROM_BOX_ADDRESS is completely silent (no errors despite
not being compatible), this is super dangerous.

Besides, the Box_d has default policy ID_EXPLICIT, so it should
have been that in the first place.
2019-11-19 16:40:11 +01:00
Mael Rouxel-Labbé b7d20e0033 Move range splitting higher to also parallelize 'box_intersection_d()' 2019-11-19 14:40:30 +01:00
Mael Rouxel-Labbé ac86fadd7a Misc code formatting improvements 2019-11-19 12:51:17 +01:00
Mael Rouxel-Labbé 44e2b52ca7 Clean superfluous overloads 2019-11-19 12:50:21 +01:00
Mael Rouxel-Labbé 4bbaafe808 Fix using undefined type 2019-11-19 11:56:10 +01:00
Mael d33eb65cbf
fix CGAL_USE usage 2019-11-18 15:43:04 +01:00
Andreas Fabri a682dcb360 use -> USE 2019-11-18 14:21:21 +01:00
Andreas Fabri a44674a694 Add ConcurrencyTag in Box_intersection_d 2019-11-15 21:45:19 +01:00
Andreas Fabri bef2b5f1b8 Parallelize using 2 or 4 parallel threads 2019-11-15 16:21:25 +01:00
Sébastien Loriot 884b2cf2ab restore removed code 2019-11-13 15:41:11 +01:00
Andreas Fabri 0faaf2d21c Add CGAL_LINKED_WITH_TBB in the Box_intersection_d without ConcurrencyTag 2019-11-12 18:35:46 +01:00
Andreas Fabri ead0da3c77 WIP: not the same number of intersections for Tuyaeaux.stl 2019-11-12 11:40:40 +01:00
Andreas Fabri b6bc521c22 WIP does not even compile 2019-11-08 16:21:20 +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 030776f6ae fix warnings 2019-07-18 18:26:55 +02:00
Sébastien Loriot 974dfe06c0 rename example 2019-07-18 17:48:16 +02:00
Andreas Fabri 5a9eaa4fc5 Add an example that implements a do_intersect for two polylines 2019-07-18 16:42:58 +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
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 89aca9f766 Fix the warning [-Wunused-result] 2019-01-10 17:19:48 +01:00