f9917c487e
CMake 2.8.11
2015-07-13 12:36:43 +02:00
2cee9fc33e
Merge branch 'CGAL-misc_warnings-GF'
...
Approved by the release manager
2015-01-12 13:00:41 +01:00
8929fd43c1
Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
...
Approved by the release manager
Conflicts:
Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
6e36a853a9
Merge branch 'Surface_mesh-new_package-GF'
...
Approved by the release manager
Conflicts:
Documentation/doc/Documentation/dependencies
Documentation/resources/how_to_cite_cgal.bib.in
Installation/changes.html
2015-01-12 11:27:35 +01:00
b8ef643b60
use CGAL_USE_TYPE
2015-01-08 10:33:50 +01:00
13db26b8ca
use CGAL_USE_TYPE
2014-12-31 13:45:08 +01:00
3a5a65f264
update branch
2014-12-08 17:30:41 +01:00
43b8390a70
Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF
2014-08-08 12:47:15 +02:00
3deb8e7910
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.
There was a conflict with two features recently merged into 'master' for
CGAL-4.5:
- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
the small feature:
http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper
- parallelism for Triangulation_3 and Mesh_3:
http://cgal.org/wiki/Features/Parallel_Mesh_3
Conflicts:
Combinatorial_map/include/CGAL/Cell_attribute.h
Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
Polyhedron/demo/Polyhedron/Polyhedron_type.h
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
I also modified the following files during the conflict resolution:
Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +02:00
fbf824c711
Merge branch 'Mesh_3-parallel-cjamin'
...
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3
Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
2aadba50d7
Merge branch 'BGL-redesign_final-GF'
...
Introduces a redesign of the CGAL extension of the BGL API
Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager
Conflicts:
Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
fee85470c1
Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf
...
Conflicts:
.gitattributes
Matrix_search/include/CGAL/rectangular_3_center_2.h
Spatial_sorting/include/CGAL/spatial_sort.h
2014-07-03 16:34:46 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
15272293a8
Fix compilation with GCC
2014-06-30 21:29:12 +02:00
97c0d3f0ce
Add a CMakeLists.txt file for STL_Extension tests (needed for TBB)
2014-06-30 16:38:05 +02:00
e77004089d
Display a note if TBB is not availlable
2014-06-25 19:37:29 +02:00
675d26e884
add non-documented remove_const fcts to turn a const-iterator to an iterator
2014-06-24 16:35:10 +02:00
e92101ceaa
Replaced some C++11 lambda functions by functors
2014-06-05 11:43:02 +02:00
5576570846
Clean-up temporary/debug code
2014-05-23 14:42:51 +02:00
3fa09693a3
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
Mesh_3/include/CGAL/Mesh_polyhedron_3.h
Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
2014-05-21 18:24:17 +02:00
d34ebbaafa
update names in the testsuite
2014-05-21 16:19:12 +02:00
85b29aed5f
treat merge conflicts
2014-05-15 16:09:24 +02:00
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
897f585f12
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Need the Interval_nt/long interoperability for Eigen.
2014-05-07 18:41:17 +02:00
239b6d0932
Merge branch 'STL_extension-Compact_container_as_vector-cjamin-old' into STL_extension-Compact_container_as_vector-cjamin
2014-04-16 14:14:24 +01:00
a2ef3c10f0
Change the name of timestamp policies
2014-04-16 12:36:40 +02:00
1396d65b48
Test the time stamper policy in the testsuite
2014-04-16 12:34:30 +02:00
f8a97dc424
Check that Compact_container accepts incomplete types
2014-04-15 18:00:18 +02:00
304916004a
Fix more warnings (unused local typedefs)
2014-04-01 16:29:34 +02:00
3168c851a1
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Conflicts:
Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex
Kernel_d/doc_tex/Kernel_d_ref/Homogeneous_d.tex
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
Kernel_d/doc_tex/Kernel_d_ref/main.tex
Resolved by dropping those files.
2014-03-12 12:38:08 +01:00
157cd0465f
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
Mesh_3/include/CGAL/Mesh_3/config.h
Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/include/CGAL/exude_mesh_3.h
Mesh_3/test/Mesh_3/test_meshing_utilities.h
Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
2014-03-10 17:01:03 +01:00
5a8cc40ad7
Fix a warning
...
test/STL_Extension/test_Compact_container.cpp:110:34: warning: unused variable 't20' [-Wunused-variable]
2014-02-21 17:41:31 +01:00
c24356e330
Protect the test of CGAL::copy_n
...
CGAL::copy_n is deprecated, so 'test_namespaces.cpp' must not warn about
it, and the test cannot be done if CGAL_NO_DEPRECATED_CODE is defined.
2014-01-31 16:50:36 +01:00
3ed92e1c1a
Merge branch 'STL_Extension-Boolean_tag_Boost_Integral_Constant-lrineau'
...
Small feature:
cgal.org/wiki/Features/Small_Features/Boolean_tag_is_a_Boost_Integral_Constant
Now CGAL::Boolean_tag<true> and CGAL::Boolean_tag<true> are model of the
Boost concept "Integral Constant".
Tested in CGAL-4.4-Ic-84.
2014-01-09 17:54:28 +01:00
fc91cad0b1
Test
2013-12-20 15:05:14 +01:00
59f476b5b4
Merge branch 'STL_Extension-fix_make_sorted_pair-local'
...
Bug-fix when using make_sorted_pair on different types
Successfully tested in CGAL-4.4-Ic-62
Approved by the release manager
2013-12-20 08:44:23 +01:00
3adb58e046
better support of heterogeneous but compatible types
2013-12-17 20:37:19 +01:00
5d1eacf16f
rename get_erase_counter => erase_counter
...
And add it to the concept ObjectWithEraseCounter
2013-12-12 07:23:07 +01:00
11c186e769
Fix a warning
2013-12-10 18:56:42 +01:00
8ddf8255d5
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Hopefully the doc will be easier to build this way.
2013-11-23 12:34:18 +01:00
ec8e949d21
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-11-21 10:50:55 +01:00
06009bfc03
fix leaks
2013-11-15 16:19:49 +01:00
5f9ab81512
add the function make_sorted_pair
2013-10-18 10:44:54 -07:00
f0d470ae28
Removed get_erase_counter&co from the test
2013-10-14 17:54:15 +02:00
e1a8bbf7af
Do not test if CGAL_NO_DEPRECATED_CODE is defined
...
Trivial-bug fix for master.
2013-10-09 15:55:26 +02:00
41929ed520
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/dont_submit
Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h
Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
Triangulation_3/doc/Triangulation_3/PackageDescription.txt
2013-09-25 11:47:43 +02:00
5237f4359f
CGAL_USE variables
2013-09-18 12:17:24 +02:00
af6c0819d9
Remove warnings from test_N_tuple.cpp (that tests deprecated classes)
...
Trivial bug-fix for master.
2013-09-11 15:40:10 +02:00
5026d0a4b6
really add the testsuite
2013-09-10 11:39:02 +02:00
224a54303a
Make Tag_true and Tag_false be models of the Boost Integral Constant model
...
http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html
2013-08-27 17:07:24 +02:00
Laurent Rineau
Andreas Fabri
Jane Tournois
Clement Jamin
Sébastien Loriot
Marc Glisse