Commit Graph

76 Commits

Author SHA1 Message Date
Sébastien Loriot dfc386d65b Merge branch 'master' into HEAD 2023-06-22 14:05:45 +02:00
Sébastien Loriot c8a88b9014 remove CGAL_static_assertion* 2023-06-15 10:42:10 +02:00
Sébastien Loriot 852b3b664b expand -CGAL_CPP17_INLINE macro 2023-06-15 10:40:54 +02:00
Sébastien Loriot b039040f73 boost::is_convertible -> std::is_convertible 2023-04-23 22:37:07 +02:00
Sébastien Loriot 9dd8235dc5 more workarounds for MSVC 2015
[skip ci]
2022-08-10 23:50:39 +02:00
Sébastien Loriot 79f9d82389 use _v prefixed version 2022-05-06 15:28:50 +02:00
Laurent Rineau 6260d5a4e4 Use expression SFINAE for Has_member_report 2022-04-19 14:46:40 +02:00
Andreas Fabri 3afc54895a Box_intersection_d-progress_tracking-GF 2022-03-29 14:18:07 +01:00
Laurent Rineau 5a1c67135d Merge pull request #5630 from GilesBathgate/Box_intersection_d-simplify_segment_tree_iterative_radon-GilesBathgate
Dependency inversion in Iterative_radon of segment_tree.h
2022-01-12 12:24:36 +01: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
Giles Bathgate 708e3d63b4 Dependency inversion in segment_tree.h 2021-04-18 14:19:45 +01:00
Andreas Fabri 6b36ea0763 Replace built-in array with std::array 2021-02-18 09:46:41 +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
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é 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
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau cd6fe20bd4 Merge branch 'releases/CGAL-4.11-branch' 2018-03-26 11:03:37 +02:00
Mael Rouxel-Labbé 3ae153eeb7 Added a comment to explain why there is duplication 2018-03-15 12:25:14 +01:00
Mael Rouxel-Labbé 991987926c Fixed cutoff parameter not being properly propagated
and simplified the default initilization functions
2018-03-15 12:23:33 +01:00
Andreas Fabri 22bd2815a3 Polyhedron 2018-01-17 17:13:53 +00:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 2b35bddfb2 Replace all std::binary_function by CGAL::binary_function 2017-10-04 16:36:32 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Andreas Fabri 9d36d33e46 Define and use CGAL_NO_ATOMIC 2016-09-22 15:41:53 +02:00
Andreas Fabri 41530c0ab4 fix 2016-09-20 09:53:31 +02:00
Andreas Fabri 4d1ff6fa81 no parethesis for atomic 2016-09-07 09:21:10 +02:00