songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cgal/Combinatorial_map/include/CGAL
History
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
..
internal Fix CMap with clang -std=c++11 2014-06-27 16:29:53 +02:00
Cell_attribute.h Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 2014-07-18 15:47:14 +02:00
Cell_const_iterators.h merge changes from next 2012-01-09 12:33:39 +00:00
Cell_iterators.h Two bugfix: 1) one mark not shared for CMap_cell_iterator 2) use of two least significant bits for Cell_attribute when support of dart is disable. Add tests in test suite for these cases. 2013-04-26 10:57:53 +02:00
Combinatorial_map.h * bugfix in first_dart: remove null_handle when cmap is empty and not null_dart_handle 2014-06-13 11:31:32 +02:00
Combinatorial_map_basic_operations.h Mainly added includes 2013-09-13 22:24:30 +02:00
Combinatorial_map_constructors.h Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Combinatorial_map_functors.h Combinatorial map with no static dart_null_handle. 2013-11-12 22:27:44 +01:00
Combinatorial_map_insertions.h Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Combinatorial_map_iterators_base.h Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Combinatorial_map_min_items.h apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Combinatorial_map_operations.h Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Combinatorial_map_storages.h Remove function get_attribute_of_dart which is useless. 2013-11-19 15:42:51 +01:00
Dart.h additional fixes for Combinatorial map package 2014-05-21 18:47:33 +02:00
Dart_const_iterators.h merge changes from next 2012-01-09 12:33:39 +00:00
Dart_iterators.h * bugfix in first_dart: remove null_handle when cmap is empty and not null_dart_handle 2014-06-13 11:31:32 +02:00