Commit Graph

262 Commits

Author SHA1 Message Date
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
R.E. Wolff adb0b9d6f4 Merge branch 'master' of github.com:rewolff/cgal 2020-04-19 14:27:48 +02:00
R.E. Wolff ca7a9380b7 Fixed unusable error message 2020-04-19 14:27:22 +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 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Laurent Rineau 2c5826dd6f Merge pull request #4474 from sloriot/CGAL-warning_macro
Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
2020-01-17 16:29:49 +01:00
Laurent Rineau fe91249ac4 Merge pull request #4474 from sloriot/CGAL-warning_macro
Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
2020-01-17 16:27:13 +01:00
Sébastien Loriot 4fbd1ed69c use CGAL_warning_msg instead of CGAL_warning to display a message 2020-01-16 14:14:13 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +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é e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02: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 8ec090d1d1 remove condition for cpp11 in Nef 2019-03-29 10:41:50 +01:00
Andreas Fabri a77988e149 Fix Nef_3 2019-01-24 18:06:03 +01:00
Andreas Fabri 09ae18b191 Fix Nef_3 2019-01-22 19:07:31 +01:00
Andreas Fabri 9fc58ff874 Fix SNC_sphere_map 2019-01-22 19:07:31 +01:00
Andreas Fabri d8f608fa51 fix Nef_3 2019-01-15 18:20:36 +01:00
Andreas Fabri 97ac4d5f51 Exploit that construct is variadic 2018-04-17 14:15:07 +01:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Laurent Rineau 182239d6b6
Merge branch 'master' into CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF 2018-03-06 16:49:30 +01:00
Andreas Fabri eb526fc4f5 Replacements and suppress warnings in the test code 2018-02-20 13:10:38 +00:00
Andreas Fabri fa92aa49f7 Nef 2018-01-18 10:43:57 +00:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 97e8ea1794 remove extra space 2017-11-12 10:17:51 +01:00
Maxime Gimeno 45edec15db Nef_plugin works with surface_mesh. 2017-05-29 12:12:31 +02:00
Sébastien Loriot 4cbb19ecf4 remove unused variable warnings 2017-01-30 07:22:48 +01: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
Laurent Rineau c826500c7d Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse
Misc GMPXX fixes
2016-10-20 09:47:39 +02:00
Laurent Rineau b76e1e021a Merge pull request #1470 from sloriot/Nef_3-cst_from_FaceGraph
Add a Nef_3 constructor from a FaceGraph
2016-10-17 10:03:28 +02:00
Laurent Rineau 038a310a1a Merge pull request #1446 from sloriot/CGAL-remove_dont_submit
Getting rid of the remaining dont_submit files
2016-10-17 10:01:30 +02:00
Laurent Rineau 2e4354f2e6 Merge pull request #1421 from afabri/Nef_3-static-GF
Nef_3: Make variables atomic
2016-10-17 09:59:36 +02:00
Marc Glisse 5bee5f5922 Workarounds for expression templates. 2016-10-15 18:21:54 +02:00
Sébastien Loriot b572d76f16 move unused files to archive 2016-10-06 09:53:36 +02:00
Andreas Fabri 66fb38611d no need for CGAL/tss.h 2016-10-05 16:15:49 +02:00
Andreas Fabri bc8e29b025 Split the file CGAL/Nef_3/ID_support_handler in two files,
one with the generic function, one with the specialization used by Nef_3.
2016-09-30 15:23:15 +02:00
Laurent Rineau c22dcd0e2c Missing includes 2016-09-30 15:23:15 +02:00
Andreas Fabri b571c968ed Fix package Nef_3: include headers 2016-09-30 15:22:30 +02:00
Laurent Rineau 3ba403471c Use CGAL::cpp11::atomic only when possible 2016-09-22 15:38:02 +02:00
Sébastien Loriot f1f82785ac add a constructor from a FaceGraph
The first version code is from @afabri
2016-09-21 08:47:06 +02:00
Andreas Fabri 0695aa3fcd Protect a counter shared by all threads using atomic 2016-09-06 11:18:22 +02:00
Andreas Fabri 099b98da01 Make variables thread local 2016-08-31 12:56:46 +02:00