songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cgal/STL_Extension/test/STL_Extension
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
..
CMakeLists.txt Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-07-01 10:38:14 +02:00
test_Boolean_tag.cpp Make Tag_true and Tag_false be models of the Boost Integral Constant model 2013-08-27 17:07:24 +02:00
test_Cache.cpp less warnings in various packages 2013-02-01 10:27:07 +01:00
test_Compact_container.cpp Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 2014-07-18 15:47:14 +02:00
test_Concatenate_iterator.cpp less warnings in various packages 2013-02-01 10:27:07 +01:00
test_Concurrent_compact_container.cpp Fix compilation with GCC 2014-06-30 21:29:12 +02:00
test_Flattening_iterator.cpp
…
test_Handle_with_policy.cpp
…
test_In_place_list.cpp add non-documented remove_const fcts to turn a const-iterator to an iterator 2014-06-24 16:35:10 +02:00
test_Modifiable_priority_queue.cpp replace CGAL_[kernel/qpe/triangulation/]_assertion by assert in tests 2013-03-21 10:50:55 +01:00
test_N_tuple.cpp Do not test if CGAL_NO_DEPRECATED_CODE is defined 2013-10-09 15:55:26 +02:00
test_Nested_iterator.cpp
…
test_Object.cpp CGAL_USE variables 2013-09-18 12:17:24 +02:00
test_Uncertain.cpp Fix test_Uncertain.cpp when CGAL_NDEBUG is set 2013-03-26 12:18:30 +01:00
test_complexity_tags.cpp
…
test_composition.cpp Add missing #include <cassert> 2013-04-25 11:20:36 +02:00
test_dispatch_output.cpp Merge branch 'Kernel-replace_object-pmoeller' 2013-06-14 14:26:05 +02:00
test_is_iterator.cpp Move is_iterator changes back to the original file. 2013-07-19 21:55:34 +02:00
test_is_streamable.cpp less warnings in various packages 2013-02-01 10:27:07 +01:00
test_lexcompare_outputrange.cpp
…
test_multiset.cpp Add missing #include <cassert> 2013-04-25 11:20:36 +02:00
test_namespaces.cpp Protect the test of CGAL::copy_n 2014-01-31 16:50:36 +01:00
test_stl_extension.cpp Merge branch 'STL_Extension-fix_make_sorted_pair-local' 2013-12-20 08:44:23 +01:00
test_type_traits.cpp
…
test_vector.cpp add non-documented remove_const fcts to turn a const-iterator to an iterator 2014-06-24 16:35:10 +02:00