Commit Graph

3301 Commits

Author SHA1 Message Date
Sébastien Loriot 58b10a3605 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:50 +01:00
Sébastien Loriot c1a42c7d37 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:21 +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
Laurent Rineau e6a42bb597 Fix again a compilation error on Windows
It was:
```
..\include\CGAL/Mesh_3/Protect_edges_sizing_field.h(1265): error C2121: '#': invalid character: possibly the result of a macro expansion
..\include\CGAL/Mesh_3/Protect_edges_sizing_field.h(1257): error C2760: syntax error: unexpected token 'identifier', expected '('
```
2020-03-24 21:20:44 +01:00
Laurent Rineau 6d215c776b Fix compilation error on Windows 2020-03-19 13:28:23 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Sébastien Loriot cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Laurent Rineau 789d3314b6
Merge branch 'master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-03-13 17:14:13 +01:00
Mael Rouxel-Labbé 0a2b590110 Use the BGL automatic index map initializer 2020-03-05 15:31:40 +01:00
Laurent Rineau 661924f9bf Labeled_mesh_domain_3: Fix the `value_outside` parameter 2020-03-02 17:15:16 +01:00
Simon Giraudot 66ebb5a7d6 Fix missing Eigen dep in targets 2020-02-10 11:57:57 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +01:00
Laurent Rineau 5fc7b97e32 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:34:56 +01:00
Laurent Rineau 85e2c79dce Merge pull request #4494 from lrineau/Mesh_3-binary_IO_CRLF_issue-GF
Mesh_3 binary I/O: allow to read a binary file with a CRLF EOL at the end of first line
2020-01-29 16:29:44 +01:00
Laurent Rineau 315a0b54d1 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:27:53 +01:00
Laurent Rineau 06b1572e4d Merge pull request #4494 from lrineau/Mesh_3-binary_IO_CRLF_issue-GF
Mesh_3 binary I/O: allow to read a binary file with a CRLF EOL at the end of first line
2020-01-29 16:27:41 +01:00
Laurent Rineau 4e102d9784 Allow to read a binary file with a CRLF EOL at the end of first line 2020-01-28 15:35:27 +01:00
Maxime Gimeno e3c1de5f03 fix helpers 2020-01-28 10:36:19 +01:00
Maxime Gimeno 05735be4e3 Overload atomic<T*> instead of atomic<T> 2020-01-27 16:02:24 +01:00
Maxime Gimeno 5fbaaa9e42 Workaround for VS 2015 2020-01-27 10:25:24 +01:00
Laurent Rineau c8fe41922d Add a debug display with CGAL_MESH_3_PROTECTION_DEBUG & 1 2020-01-20 18:19:52 +01:00
Laurent Rineau 4532ae48b7 Improve the code that deals with CGAL_MESH_3_DEBUG_FACET_CRITERIA 2020-01-20 18:18:45 +01:00
Laurent Rineau a4991fd6da More dump of the c3t3 in case of crash 2020-01-20 18:18:45 +01:00
Laurent Rineau 455f8c6351 Merge pull request #4463 from lrineau/Polyhedron_demo-fix_mesh_3_plugin-GF
Bug in the demo (mesh_3_plugin)
2020-01-15 17:31:44 +01:00
Laurent Rineau eff864a2a9 Merge pull request #4463 from lrineau/Polyhedron_demo-fix_mesh_3_plugin-GF
Bug in the demo (mesh_3_plugin)
2020-01-15 17:19:13 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Laurent Rineau 597a4f1283 Bug in the demo (mesh_3_plugin) 2020-01-10 15:20:56 +01:00
Laurent Rineau 0b0154cac2 Bug in the demo 2020-01-09 16:52:40 +01:00
Laurent Rineau daf2e6839f Improve the code that deals with CGAL_MESH_3_PROTECTION_DEBUG 2020-01-09 16:52:05 +01:00
Laurent Rineau a8cb280133 Fix a compilation error with CGAL_MESH_3_PROTECTION_DEBUG 2020-01-08 15:52:12 +01:00
Laurent Rineau 9de3913dbf Fix warnings 2020-01-08 15:49:16 +01:00
Sebastien Loriot 2c4c4d357a
Merge pull request #4422 from lrineau/Mesh_3-cleanup_detect_polylines-GF
Cleanup: remove unused files from Mesh_3
2019-12-20 09:15:14 +01:00
Laurent Rineau 674627937c Merge pull request #4389 from lrineau/DT_3-issue4388-GF
Fix  DT3 parallel performance loss (issue #4388)
2019-12-17 09:16:52 +01:00
Laurent Rineau b826770302 Merge pull request #4397 from afabri/T3_accelerate_insert_in_hole
Triangulation_3: Accelerate point insertion
2019-12-17 09:16:35 +01:00
Laurent Rineau de1074426b Merge pull request #4389 from lrineau/DT_3-issue4388-GF
Fix  DT3 parallel performance loss (issue #4388)
2019-12-17 09:15:48 +01:00
Laurent Rineau 1224939bcb Cleanup: remove unused files
That is a follow-up to the PR https://github.com/CGAL/cgal/pull/2336.
2019-12-16 10:49:35 +01:00
Laurent Rineau 048691b454 Fix test_c3t3_io.cpp after the change in cells order
As this branch modified `insert_in_hole`, then the order of cells in
the cells container is modified.
2019-12-10 14:26:12 +01:00
Laurent Rineau 0fa0c4fbb9 Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno
AABB_tree: make accelerate distance queries default
2019-12-05 11:05:35 +01:00
Laurent Rineau 3b5d13f023 Merge pull request #4250 from maxGimeno/PMP-Side_of_tm-use_bbox-maxGimeno
PMP: Make Side_of_triangle_mesh faster for disjoint meshes
2019-12-05 11:05:29 +01:00
Laurent Rineau 6cdd833e13 Merge branch 'DT_3-issue4388__for_CGAL-4.14.2-GF' into DT_3-issue4388-GF 2019-12-04 15:39:55 +01:00
Laurent Rineau 6ded244449 Merge branch 'DT_3-issue4388__for_CGAL-4.13.2-GF' into DT_3-issue4388__for_CGAL-4.14.2-GF 2019-12-04 15:32:07 +01:00
Laurent Rineau 3ade506eba Create approximate_size() in Concurrent_compact_container
Instead of having an atomic integer for the size of the compact
container, now all free lists have an atomic integer for their size,
but it is only updated when the size is increased by 10%.
2019-12-04 15:20:52 +01:00
Mael Rouxel-Labbé 6f0bbc90df Enable parallel for three tests in Mesh_3/test that relied on CONCURRENT_MESH_3
The macro was never defined and if it had been, the targets would not have
been linked properly anyway.
2019-11-20 12:46:42 +01:00