I have decided to revert this commit:
> commit 874e96a553
> Author: Laurent Rineau <laurent.rineau@cgal.org>
> Date: Tue Feb 4 12:33:59 2014 +0100
>
> Fix a bug of the bissection oracle (Labeled_mesh_domain_3)
>
> In CGAL-4.2 and previous, when a facet f was between finite cells c1,
> and c2, with different subdomain indices, the surface patch index of f
> was the pair { c1->subdomain_index(), c2->subdomain_index() }, say the
> pair (1, 2). Since CGAL-4.3, with
> CGAL_MESH_3_NO_LONGER_CALLS_DO_INTERSECT_3, the Do_intersect functor of
> the domain is no longer called, and only Construct_intersection. If the
> bissection eventually found out that the bissection ended up between the
> volumes labeled 1 and 3, then the returned surface patch index was
> {1,3}, instead of {1,2}. That commit fixes that "bug", and restores
> the behavior of CGAL-4.2.
I have "fixed" the test as well.
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