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

13 Commits

Author SHA1 Message Date
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
Laurent Rineau 14563753b7 Fix the test 2014-04-16 15:35:13 +02:00
Laurent Rineau 76e6325e50 Check the equality using the operator<< to a stringstream 2014-04-16 15:27:13 +02:00
Clement Jamin 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
Andreas Fabri a165f3b90b Write "Note" instead of "warning" inside a pragma message 2013-09-12 12:49:08 +02:00
Clement Jamin 206b20bc15 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-07-02 17:37:50 +02:00
Laurent Rineau 4f622097c4 Fix compilation error on MSVC: #warning does not exist 2013-06-26 11:39:03 +02:00
Laurent Rineau 5d5bf5e834 Trick to "fix" an error on Windows 
The test test_c3t3_io.cpp writes and reads back a c3t3. Then it tries to
compare the two triangulations. The issue is that the facets iterator of
Triangulation_3 is not deterministic, at least on Windows.
 2013-06-25 14:48:28 +02:00
Clement Jamin f14f31dbfb More explanation on why we may encounter an assertion here. 
See comment in the code
 2013-03-14 10:54:07 +01:00
Clement Jamin 0a04448720 The Mesh_3 tests are now parallel if CGAL_CONCURRENT_MESH_3 is defined. 2013-03-13 20:24:36 +01:00
Laurent Rineau a50e060a19 Remove unused variables 2013-02-07 15:27:16 +01:00
Laurent Rineau 282aec41d1 Convert header files created by Jane to Unix style 
Otherwise that really complicates merging operations!
 2012-08-22 16:11:40 +00:00
Jane Tournois dfbe03de54 Add a test of the I/O operators of C3t3, in ascii and binary modes, and when all indices are integers or not. 
(part of r61189 from Mesh_3-experimental-GF)
 2012-07-20 09:03:17 +00:00