Commit Graph

561 Commits

Author SHA1 Message Date
Laurent Rineau a828cb0d06 Merge pull request #4620 from janetournois/Tetrahedral_remeshing-new-jtournois
Tetrahedral remeshing - new package
2020-06-03 16:23:17 +02:00
Maxime Gimeno 4af1e73f69 Work around for moc bug 2020-06-02 10:12:10 +02:00
Laurent Rineau 7173530dad Merge pull request #4557 from lrineau/NewKernel_d-det-GF-CGAL-5.0
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (CGAL-5.0 and later)
2020-05-27 18:27:56 +02:00
Jane Tournois b6912d92ea fix warnings
- move #define a better location
- conversion double/size_t
- unused parameters
- automatic conversion int/boolean
2020-05-15 13:54:19 +02:00
Jane Tournois 3d5fc5c1ca silent warning "STL4009: std::allocator<void> is deprecated in C++17."
from boost-1_71\boost/bimap/detail/manage_additional_parameters.hpp(86):
warning C4996: 'std::allocator<void>': warning STL4009: std::allocator<void>
 is deprecated in C++17.
You can define _SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING or
_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS
to acknowledge that you have received this warning.

see https://github.com/boostorg/beast/issues/1272
it seems that this warning is an error in msvc
2020-05-14 13:51:41 +02:00
Mael Rouxel-Labbé 01d5e5f2b8 Add CGAL_NO_UNIQUE_ADDRESS 2020-05-12 12:53:59 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Jane Tournois cf58a08a55 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-20 06:24:36 +02:00
Sébastien Loriot 825f77baaa add license include directives 2020-04-10 14:14:30 +02:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Sébastien Loriot 5c5d445eb3 Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:27:43 +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 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé 54d41c816b Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-24 12:03:07 +01:00
Laurent Rineau 2f4e49bfff Fix forward-declarations of CGAL::Surface_mesh
In the forward-declaration, the template parameters do not matter, but
they do if the code is read by an IDE (with IntelliSense for example).
2020-03-23 09:47:01 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Mael Rouxel-Labbé 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +01:00
Laurent Rineau 0dfd416395 Use [[noreturn]] directly 2020-03-06 09:26:54 +01:00
Laurent Rineau 2b01447391 Next release on this branch will be 5.0.3 2020-02-25 09:46:40 +01:00
Laurent Rineau e40aaafd28 Next release in this branch will be 4.14.4 2020-02-25 09:43:08 +01:00
Mael Rouxel-Labbé 65c1a4f81b Clean code and headers (no real changes) 2020-01-28 12:10:59 +01:00
Laurent Rineau 7868c454e7 Next version on this branch will be 5.0.2 2020-01-27 11:24:09 +01:00
Michel Zou 17a58a5625 version.h: workaround for SWIG parsing 2020-01-17 16:36:35 +01:00
Michel Zou f86b948845 version.h: workaround for SWIG parsing 2020-01-17 16:32:07 +01:00
Laurent Rineau d26c2e9e53 Merge pull request #4475 from lrineau/Installation-workaround_for_SWIG_parser-xantares-lrineau
Workaround for SWIG parser
2020-01-17 16:26:13 +01:00
Michel Zou 3b8d77aa8a version.h: workaround for SWIG parsing 2020-01-14 10:01:00 +01:00
Laurent Rineau e628e6e203 This branch target 4.14.3 2019-12-12 10:50:20 +01:00
Mael Rouxel-Labbé 844cd55f85 Add license files 2019-12-09 15:43:30 +01:00
Guillaume Damiand 90457b38c7 Update licences 2019-11-26 14:21:39 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Laurent Rineau abd7f5a099 Mext release in this branch will be 5.0.1 2019-11-08 20:57:39 +01:00
Laurent Rineau 68ca489924 Next release on master will be 5.1-dev 2019-11-08 18:13:44 +01:00
Laurent Rineau 27dcff6141 Prepare CGAL-5.0 finale version 2019-11-08 10:58:29 +01:00
Sébastien Loriot bff5db68e1 fix some remaining license notice + add a missing LicenseRef-Commercial 2019-10-31 14:17:20 +01:00
Laurent Rineau 387f55cfca Next version in this branch will be 5.0-beta3 (or the final release) 2019-10-31 10:32:50 +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 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 1c829dcb08 remove extra space 2019-10-18 22:04:37 +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
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
Do not require -DCGAL_HEADER_ONLY
2019-10-15 16:34:09 +02:00
Laurent Rineau 119055d688 Merge pull request #4281 from sloriot/CGAL-default_endian
Add a way to define a default endianness
2019-10-15 16:31:39 +02:00
Laurent Rineau b6a935c3cf Merge pull request #4292 from maxGimeno/CGAL_Config-Fix_typo-maxGimeno
Remove extra S in macro
2019-10-15 16:31:24 +02:00
Maxime Gimeno 856b7722f1 Remove extra S in macro 2019-10-15 09:03:13 +02:00
Laurent Rineau 9c67734dcc Push the `#define CGAL_HEADER_ONLY` at the top 2019-10-11 12:02:25 +02:00
Laurent Rineau e872e74654 Refactor the code 2019-10-10 17:59:46 +02:00
Sébastien Loriot 2f1ab3a86d rename macro 2019-10-10 14:45:42 +02:00
Sébastien Loriot 66e3b216be add a way to define a default endian 2019-10-10 13:00:33 +02:00
Laurent Rineau 779ef144fe Do not require -DCGAL_HEADER_ONLY
Now, that macro is set unless `CGAL_NOT_HEADER_ONLY` is 1.
2019-10-01 18:10:30 +02:00
Laurent Rineau 44547d40ec Next release in this branch will be 5.0-beta2 2019-09-30 15:25:45 +02:00
Laurent Rineau 5be38d3af0 Next release in this branch will be 4.14.2 2019-09-30 15:19:47 +02:00
Laurent Rineau 1bce3f7909 Merge branch 'releases/CGAL-4.14-branch' 2019-09-27 16:25:29 +02:00
Laurent Rineau 0b66eb0d23 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
# Conflicts:
#	.travis/install.sh
2019-09-27 16:24:41 +02:00
Maxime Gimeno 2473456405 update auto-link.h 2019-09-27 16:06:12 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
2019-07-18 17:05:25 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +02:00
Laurent Rineau 58e12565e3 Prepare release candidates for 5.0-beta1 2019-07-12 15:31:07 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Laurent Rineau d3b9d89596 Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
2019-07-10 14:22:53 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Laurent Rineau 2ce7800239 Unfortunately gcc < 9.1 has bug with thread_local that impact CGAL 2019-06-24 14:27:20 +02:00
Guillaume Damiand 1dbc088459 Update licences; move undocumented files to internal (both directory and namespace) 2019-06-20 16:51:53 +02:00
Guillaume Damiand 62167eb065 Add surface mesh topology package in gpl list 2019-06-20 16:13:42 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Liangliang Nan fadaee63a8 integrated PolyFit 2019-06-05 17:50:37 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Dmitry Anisimov 13d0156482 fixed docs, references, biblio, and license 2019-04-22 13:06:20 +02:00
Mael Rouxel-Labbé 52915956e3 Add PMP/locate.h 2019-04-19 08:39:02 +02:00
Simon Giraudot d8b51a9672 Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-04-09 15:22:45 +02:00
Maxime Gimeno 78db3f646d Solve conflicts 2019-04-09 10:04:44 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau 3a32f3f3ef Restore CGAL::cpp11 temporarily
This reverts commit 04978d8aae.
2019-04-01 18:27:35 +02:00
Laurent Rineau e09f692e74 master now targets CGAL 5.0 2019-03-29 16:02:15 +01:00
Laurent Rineau 57a41b3d2a Towards CGAL-4.14.1 2019-03-29 15:59:03 +01:00
Laurent Rineau 99ca804f6d Maybe tonight's internal release will be CGAL-4.14 final 2019-03-28 16:45:09 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Laurent Rineau e9f36ff557 Prepare for CGAL-4.14-beta4 2019-03-27 18:03:07 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 43d1948396 master now targets a possible CGAL-4.14-beta3 2019-03-13 17:15:45 +01:00
Laurent Rineau ca67ac5c1f Remove all mentions of BLAS, LAPACK, and TAUCS in our CMake scripts 2019-03-07 09:40:08 +01:00
Laurent Rineau 911e44a1fe Prepare for beta2 2019-03-04 18:35:48 +01:00
Laurent Rineau 01e5727a50 Prepare CGAL-4.14-beta1 2019-03-01 16:27:11 +01:00
Laurent Rineau 5199eb70ee Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
2019-02-22 16:39:12 +01:00
Andreas Fabri b84f54a9e3 Do not define the macro CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS for VC2013 as suggested in Issue #3436 2019-02-08 09:46:18 +01:00
Marc Glisse 34cbb9cd4b Make Epeck_d work & C++14-only cleanups
Still some rough edges:
1) double tab[]={.1,.2,.3}; Point_d p(tab+0,tab+3); lazily stores
iterators to tab, so tab had better still be alive when we need
update_exact.
2) One functor (point on a sphere) cannot be done exactly exactly with
a representation center+squared radius.
3) Several hacks that make this not as generic as it should be.
2019-02-03 23:16:28 +01:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00