Commit Graph

267 Commits

Author SHA1 Message Date
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
Laurent Rineau ad30f5f440 Fix license header 2019-12-03 19:25:51 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Simon Giraudot c43c6ac2fa Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin 2019-10-22 13:21:53 +02:00
Simon Giraudot 54aef42f2d Fix warning 2019-10-22 13:03:35 +02:00
Simon Giraudot 89554f6063 Fix outputiterator return missing 2019-10-22 12:56:36 +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
Simon Giraudot d930cbce64 Fix no_lvalue Search_traits_adapter 2019-10-15 13:52:17 +02:00
Simon Giraudot 027de166f4 Make it possible for Search_traits_adapter to work without lvalue point map 2019-08-26 15:42:24 +02:00
Simon Giraudot 9b02d9d426 Fix warnings 2019-07-04 13:25:56 +02:00
Simon Giraudot b2e723b548 Merge branch 'Faster_dd_spatial_searching-cjamin-backup' into Faster_dd_spatial_searching-cjamin 2019-07-04 13:17:50 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Laurent Rineau f83053c2a5 Merge pull request #3602 from afabri/CGAL-VC2017_AVX_workarounds-GF
Fix for VC2017 with /arch:AVX
2019-01-22 09:14:57 +01:00
Andreas Fabri 0fe3ed828e Fix for VC2017 with /arch=AVX 2019-01-17 14:42:26 +01:00
Sébastien Loriot 5a2857d451 fix maybe uninitialized warning
triggered by target Orthogonal_incremental_neighbor_search
2018-12-06 09:23:26 +01: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
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau 796d1bdcb6 Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF
Spatial Searching: bugfix disable_if
2018-06-12 16:38:20 +02:00
Laurent Rineau c8009c7250 Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF
Spatial Searching: bugfix disable_if
2018-06-12 16:32:18 +02:00
Simon Giraudot 45afed121c Include enable_if.hpp header 2018-06-06 08:15:54 +02:00
Simon Giraudot e5ff062052 Remove extra semicolon 2018-06-04 10:48:08 +02:00
Simon Giraudot 7b0c4e087b Bugfix: make disable_if work using template and add it to Search_traits_adapter 2018-06-04 10:03:30 +02:00
Laurent Rineau 2596a302c0 Merge pull request #2954 from MaelRL/Spatial_searching-Fix_fuziness_doc-GF
Spatial searching: rework fuzzy items

# Conflicts:
#	Spatial_searching/test/Spatial_searching/Point_with_info.h
2018-06-01 17:24:02 +02:00
Laurent Rineau 5dee4b4819 Merge pull request #2954 from MaelRL/Spatial_searching-Fix_fuziness_doc-GF
Spatial searching: rework fuzzy items

# Conflicts:
#	Spatial_searching/test/Spatial_searching/Point_with_info.h
2018-06-01 17:22:10 +02:00
Mael Rouxel-Labbé 1e8f8ab358 Fixed constructing field type from non-int variables 2018-05-16 10:38:47 +02:00
Mael Rouxel-Labbé a0a6afeaca Fixed warning (?)
My kingdom for readable Windows compilation messages
2018-05-16 10:38:47 +02:00
Mael Rouxel-Labbé 40d1550d65 'if' into 'else if' since min_coord(i) <= max_coord(i) 2018-04-19 15:59:21 +02:00
Mael Rouxel-Labbé 6897cdea85 Do not use an inner approx if 'eps > r' 2018-04-19 14:16:12 +02:00
Mael Rouxel-Labbé 15d925710e Readability changes 2018-04-19 14:15:56 +02:00
Mael Rouxel-Labbé 7b510962f0 Use CGAL::square 2018-04-19 14:14:43 +02:00
Mael Rouxel-Labbé 65be29442b Reworked Fuzzy_sphere
Same as a6f52ffc31

- Also fixed the way eps > r is handled
- Cached the inner and outer squared radius instead of recomputing every time
2018-03-23 17:06:08 +01:00
Mael Rouxel-Labbé a6f52ffc31 Reworked Fuzzy_iso_box
- points on the boundary of the inner approximation are always reported
- points on the boundary of the outer approximation may or may not be reported
2018-03-23 17:03:17 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri f76e744bff Spatial_searching 2018-01-17 20:12:06 +00:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00:00
Marc Glisse e2bb2b383b
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2017-12-07 15:26:46 +01:00
Clement Jamin 5806c25460 Specify 4th template argument for Kd_tree 2017-11-24 15:35:14 +01:00
Clement Jamin 3b6364b5cc Merge branch 'Faster_dd_spatial_searching-cjamin' of github.com:cjamin/cgal into Faster_dd_spatial_searching-cjamin 2017-11-22 11:32:12 +01:00
Clement Jamin 06b18208e8 Specify 4th template argument for Kd_tree + doc 2017-11-22 11:31:58 +01:00
Sébastien Loriot 04aa045706 add missing identifiers 2017-11-21 13:41:58 +01:00
Marc Glisse 076c3b6ac1 Only check the result if we have computed a result. 2017-11-21 00:02:44 +01:00
Marc Glisse 2df3c40fd7 Don't test outer_range_contains in search_any_point.
That just slows it down. The test makes much more sense in search(),
which reports all points.
2017-11-20 23:13:47 +01:00
Clement Jamin 7d69e65cef Fix indentation 2017-11-20 10:56:47 +01:00