songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
59,293 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

447 Commits

Author SHA1 Message Date
Andreas Fabri cc4192a628 Merge branch 'Surface_mesh-fixes-GF' 
Approved by the release manager

Conflicts:
	STL_Extension/include/CGAL/Iterator_range.h
 2015-01-26 16:54:03 +01:00
Andreas Fabri 8e801bbc80 no need to use boost::range_iterator 2015-01-19 09:00:21 +01:00
Andreas Fabri 06cc350143 include a boost header instead of a forward declaration as the number of template arguments changed 2015-01-16 09:54:34 +01:00
Laurent Rineau beda93fd8e The declaration of boost::range has changed 
Use the header <boost/range.hpp>, instead of a forward declaration.
 2015-01-13 15:34:02 +01:00
Andreas Fabri 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
Andreas Fabri 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
Laurent Rineau 040916239f That cast operator is useless 
Intel Compiler even warns about that:

.../include/CGAL/Iterator_range.h(51): warning #597:
  ""CGAL::Iterator_range<I>::operator [...]" will not be called for
  implicit or explicit conversions
      operator Base() const
      ^
 2014-12-31 12:49:09 +01:00
Sébastien Loriot d4f875782c use boost::tuple if using clang and libc++ 2014-12-30 12:18:14 +01:00
Jane Tournois 175c4b321e Merge branch 'releases/CGAL-4.5-branch' 
Approved by the release manager
 2014-12-19 11:31:32 +01:00
Laurent Rineau 4a7929c611 Fix license header: should be LGPLv3+ 2014-12-18 16:51:32 +01:00
Jane Tournois 90a74c1bb6 fix a bug that happens on vc10, because atomics are not initialized 2014-12-16 16:42:22 +01:00
Jane Tournois 88142b2997 fix compilation for TBB 4.3 
this partial specialization was only used for testing, so it can be removed
The problem comes from the std::vector of mutex(s), which can't be copied
using the std::vector operator=
 2014-12-16 13:02:39 +01:00
Jane Tournois 3a5a65f264 update branch 2014-12-08 17:30:41 +01:00
Andreas Fabri 59aab9ba49 two step renaming in order to capitalize 2014-11-26 17:17:56 +01:00
Andreas Fabri 8f54ee3fa2 two step renaming in order to capitalize 2014-11-26 17:17:43 +01:00
Andreas Fabri 4355794781 iterator_range moved the package 2014-11-12 14:40:51 +01:00
Andreas Fabri 34a9d85575 adress some remarks of the reviews 2014-10-06 12:44:24 +02:00
Andreas Fabri 1979820571 cleanup 2014-10-01 12:27:20 +02:00
Andreas Fabri 8e83b04cb5 move iterator_range.h from BGL to STL_Extension 2014-10-01 09:37:11 +02:00
Andreas Fabri 8dfbe2eba4 Remove class Range again, and put functionality into iterator_range 2014-10-01 09:36:10 +02:00
Andreas Fabri 5cee5c6348 Remove the typedefs for the iterators as we offer ranges 
Remove the free functions for accessing properties
 2014-09-30 11:28:45 +02:00
Andreas Fabri 08a033ffb4 Integrate remarks from the review by Michael and Guillaume. 
Switch from pair of iterators to a range class
 2014-09-26 16:53:37 +02:00
Andreas Fabri 43b8390a70 Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF 2014-08-08 12:47:15 +02:00
Laurent Rineau 333854f38a Fix the license of two files 
Trivial fix for master.
 2014-07-31 16:19:05 +02:00
Laurent Rineau 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
Clement Jamin 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
Clement Jamin 2ae815910e Switch to LGPL 2014-07-17 18:36:21 +02:00
Andreas Fabri b1f4afbd33 Macros MUST be prefixed with CGAL_ 
-pedantic does not like extra semicolons

todo:  cleanup: The macro is there twice.
 2014-07-09 15:41:08 +02:00
Sébastien Loriot 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
Clement Jamin f742be081b Fix spaces 2014-07-08 15:40:29 +02:00
Clement Jamin f7396790ff Fix merge function 
Fixes memory leaks, and maybe some other potential problems
 2014-07-07 13:41:33 +02:00
Clement Jamin a9887cbe9f Remove a useless constructor that was causing an error 2014-07-04 11:56:02 +02:00
Sébastien Loriot 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
Clement Jamin 6aeaf509cf Add line break at the end of the file 2014-07-02 09:03:21 +02:00
Clement Jamin e3abf7fc40 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-07-01 10:38:14 +02:00
Sébastien Loriot 675d26e884 add non-documented remove_const fcts to turn a const-iterator to an iterator 2014-06-24 16:35:10 +02:00
Clement Jamin 6ed794da5b Replace ">>" by "> >" 2014-06-19 19:09:31 +02:00
Clement Jamin c9c8335811 More code clean-up 2014-05-27 13:46:34 +02:00
Clement Jamin dfe800bc40 Clean-up debug code (global lock) 2014-05-27 12:16:29 +02:00
Clement Jamin de485dfc10 Use s_iterator_to and remove the constructor I had added temporarily 2014-05-23 17:17:16 +02:00
Sébastien Loriot c7df582fc2 Revert "add the time stamper mecanism into In_place_list" 
This reverts commit 5e2ab7fddc.
 2014-05-22 11:18:55 +02:00
Sébastien Loriot 2d14739716 additional fixes for Combinatorial map package 2014-05-21 18:47:33 +02:00
Sébastien Loriot 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
Sébastien Loriot 5e2ab7fddc add the time stamper mecanism into In_place_list 2014-05-21 16:33:54 +02:00
Sébastien Loriot 1bffc44ed4 factorize the mecanism to define the time stamper in a container 2014-05-21 16:30:32 +02:00
Sébastien Loriot c6fa3f4a3a add missing namespace 2014-05-21 12:51:20 +02:00
Sébastien Loriot 82f9a83e2d move the Time stamper into a separate file 2014-05-21 12:20:50 +02:00
Sébastien Loriot cbd50574e4 clean up comments, include and copyright 2014-05-21 12:08:12 +02:00
Andreas Fabri 2f967ba6e4 the testsuite for the new version of the Constrained_triangulation_plus_2 passes 2014-05-19 15:57:24 +02:00
Andreas Fabri 85b29aed5f treat merge conflicts 2014-05-15 16:09:24 +02:00