Laurent Rineau
022b1a71d0
Merge branch 'releases/CGAL-5.0-branch'
2020-07-21 15:27:49 +02:00
Laurent Rineau
2e8a59d570
Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch
2020-07-21 15:25:54 +02:00
Laurent Rineau
1e6a5ac636
Fix the use of Construct_point_3::result in Periodic_3
2020-07-16 15:11:23 +02:00
Laurent Rineau
dcc4fb1cc1
Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
...
# Conflicts:
# STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Sébastien Loriot
3b6c100ca6
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-04-29 14:12:29 +02:00
Maxime Gimeno
627a7b29be
Fix warnings
2020-04-27 17:20:50 +02:00
Maxime Gimeno
5b2d46cfa0
Fixes for min/max
2020-04-21 12:04:45 +02:00
Maxime Gimeno
50766d9d03
Fixes for min/max
2020-04-21 11:52:56 +02:00
Maxime Gimeno
e9d41d7b7d
Fixes for min/max
2020-04-21 11:38:37 +02:00
Sébastien Loriot
86e25f7e71
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:23:54 +01:00
Sébastien Loriot
35b83deffd
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:16:25 +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
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é
2556196dad
Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF
2020-03-23 08:59:49 +01:00
Sébastien Loriot
149c7a4afc
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-03-19 16:29:33 +01:00
Sébastien Loriot
d10359d09e
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2020-03-19 16:27:55 +01:00
Mael Rouxel-Labbé
100304667d
Remove CGAL::internal::boost_::function_property_map
...
This file was duplicated from BOOST 1.64 because it appeared in a boost
release that was younger than the oldest boost release supported by CGAL
when the file was first required.
The minimum boost version (1.57) now required by CGAL is younger
than the version in which the file appeared in boost (1.51)
and it can thus be removed.
2020-03-12 20:58:44 +01:00
Mael Rouxel-Labbé
5a3d877892
Add #include for boost::result_of
2020-03-10 11:54:21 +01:00
Laurent Rineau
378554e5a7
Change the API of `for_compact_container`/`Compact_container_traits`
...
Now, we have a proper pair of getter/setter, and the `void` pointer is
get by a `reinterpret_cast`, instead of a union.
Cc: @mglisse
2020-03-09 17:19:58 +01:00
Mael Rouxel-Labbé
adec4123a0
Take return of construct_point by reference when possible
2020-03-09 16:33:08 +01:00
Mael Rouxel-Labbé
77a0115dc4
Add missing 'const'
2020-03-09 16:32:54 +01:00
Mael Rouxel-Labbé
ab9f158cb0
Merge branch 'TDS-Fix_doc-GF-old' into TDS-Fix_doc-GF
2020-01-15 18:07:51 +01:00
Maxime Gimeno
3b6888e2a9
remove QString.sprintf call
2020-01-14 15:18:47 +01:00
Maxime Gimeno
ddbfdfcfa9
Fix sprintf issue
2020-01-13 16:34:00 +01:00
Maxime Gimeno
c1acf50252
clean-up P3T3 demo
2020-01-13 16:33:43 +01:00
Maxime Gimeno
93c2247335
Replace all QTimers
2020-01-13 16:33:30 +01:00
Maxime Gimeno
1efca4b19a
Fix sprintf issue
2020-01-13 16:25:48 +01:00
Maxime Gimeno
129eae699b
clean-up P3T3 demo
2020-01-09 15:01:58 +01:00
Maxime Gimeno
4de511f052
Replace all QTimers
2020-01-09 14:11:50 +01:00
Mael Rouxel-Labbé
801187c642
Clean some tests
2019-12-30 18:30:28 +01:00
Sébastien Loriot
585bb8c7d6
fix license issues
2019-11-07 06:22:28 +01: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
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
Maxime Gimeno
660ebe9e81
Add missing highp and remove unwanted highp
2019-08-05 14:16:02 +02:00
Sébastien Loriot
fbafb9d06f
fix remaining mismatches and fix bugs
2019-07-10 11:40:45 +02:00
Sébastien Loriot
983645a51a
match @{ and @}
2019-07-05 21:49:46 +02:00
Laurent Rineau
32f80cbece
Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
...
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +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
Mael Rouxel-Labbé
19de8eda04
Merge branch 'PMP-Generalize_keep_largest_CC-GF-old' into PMP-Generalize_keep_largest_CC-GF
2019-06-17 15:18:33 +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
Mael Rouxel-Labbé
a2d5ab86cf
Fix typo
2019-05-07 11:46:17 +02:00
Maxime Gimeno
62f0a73ea6
Remove useless include_directories for Qt
2019-04-18 16:00:40 +02:00