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

174 Commits

Author SHA1 Message Date
Guillaume Damiand e4598620a1 Remove warnings 2015-03-12 07:57:04 +01:00
Guillaume Damiand 4660425d40 Bug fix in operator= of one iterator; add tests to test more cases. 2015-03-11 15:07:37 +01:00
Guillaume Damiand 6c09e5918c Add missing #include 2015-03-10 15:48:06 +01:00
Guillaume Damiand fd4162a5a1 Bug fix in size function in ranges 2015-03-03 10:37:37 +01:00
Sylvain Brandel 9a6ed32a15 Merge branch 'Combinatorial_map-update_attributes-sbrandel' 
- corresponding to small feature "Combinatorial map update attributes"
   https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager

Conflicts:
	Installation/changes.html
 2015-01-08 14:48:47 +01:00
Guillaume Damiand d851f35651 Remove warnings; wrong use of typename and template in viewer; default argument for example. 2014-12-25 08:20:00 +01:00
Guillaume Damiand 882c6033df Bug fix; optimize merge volume operations. 2014-12-23 21:07:53 +01:00
Guillaume Damiand 919bf8af74 Cleanup + some optimizations. 2014-12-23 09:34:09 +01:00
Guillaume Damiand 91ede0a444 Bug fix in toposew 2014-12-12 16:09:21 +01:00
Sylvain Brandel 08af113c95 Adding linear_cell_complex_3_attributes_management.cpp example 2014-12-12 15:41:23 +01:00
Sylvain Brandel 1cb63c386b Modification of the names of attributes management functions 2014-12-05 16:03:44 +01:00
Laurent Rineau d63a998759 Attempt to remove more warnings 2014-11-07 18:54:59 +01:00
Guillaume Damiand 8eddea1e5b Add some CGAL_assume functions in functions manipulating marks in combinatorial map class. 2014-11-07 16:42:32 +01: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
Laurent Rineau c8540086d8 Fix CMap with clang -std=c++11 
It seems that Boost.Config says std::tuple does not work, even if
variadic templates are usable.

Trivial fix for master.

(cherry picked from commit e60c9ec190611c711fff7bb9a5ffc463f93e31b7)
 2014-06-27 16:29:53 +02:00
Sylvain Brandel d62a535fd7 minor addons in the code, not in the API 2014-06-13 16:02:55 +02:00
Guillaume Damiand 174dfc336e * bugfix in first_dart: remove null_handle when cmap is empty and not null_dart_handle 
* update friend declarations
* remove useless this->set_current_dart(this->mmap->null_handle) in Dart_iterators.h
* Use inner definition CMap::Dart_of_cell_basic_const_range<i> instead of directly the class CGAL::CMap_dart_const_iterator_basic_of_cell in internal/Combinatorial_map_internal_functors.h (more generic)
 2014-06-13 11:31:32 +02:00
Sylvain Brandel ec61d7cdc0 Updating new branch with modified and new files, in accordance with provided features 2014-06-03 11:22:47 +02:00
Sébastien Loriot 2d14739716 additional fixes for Combinatorial map package 2014-05-21 18:47:33 +02:00
Clement Jamin 239b6d0932 Merge branch 'STL_extension-Compact_container_as_vector-cjamin-old' into STL_extension-Compact_container_as_vector-cjamin 2014-04-16 14:14:24 +01:00
Guillaume Damiand 3ab46250db Reinit always ref counting when creating attribute. VC12 does not use the specialized version for copy constructor but always the generic one. 2014-04-07 19:53:06 +02:00
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +01:00
Guillaume Damiand b3a7330a33 Remove function get_attribute_of_dart which is useless. 2013-11-19 15:42:51 +01:00
Guillaume Damiand 96f3835d0a Remove null vector in traits (pb with Kernel_d ?) 2013-11-19 07:30:43 +01:00
Guillaume Damiand 305b6a4ba0 Add debug message 2013-11-18 19:47:27 +01:00
Guillaume Damiand 2b6bf9fbe7 Remove a warning 2013-11-15 08:05:22 +01:00
Guillaume Damiand 42959d525f Add missing typedef 2013-11-14 13:25:45 +01:00
Guillaume Damiand 6592ca0bc7 Remove warning 2013-11-14 09:36:53 +01:00
Guillaume Damiand ddefa1f60c Remove warning 2013-11-14 08:39:34 +01:00
Guillaume Damiand 8d560a5661 Bugfix in dart functions with c++11. 2013-11-14 08:34:36 +01:00
Guillaume Damiand 61d6236b60 Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Guillaume Damiand 53f02ea00d Add storage classes (forgotten in the previous commit) 2013-11-13 13:49:59 +01:00
Guillaume Damiand dccdec40a5 Combinatorial map with no static dart_null_handle. 
This is a copy from the branch CMap_no_dart-gdamiand by keeping only the part with dart_handle.
The modifications are the ones given in the small feature Combinatorial map dart attribute.
 2013-11-12 22:27:44 +01:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Guillaume Damiand d2e409487e Bug fix in close operation. 2013-07-04 16:55:53 +02:00
Guillaume Damiand b3ad1c44c4 Merge branch 'Combinatorial_map-reverse_orientation-kenohori' 
Approved by the release manager.
 2013-06-25 12:17:36 +02:00
Guillaume Damiand 6653320136 Tests for reverse orientation. 
Bugfix: initialization of internal::Test_is_same_attribute_functor<Self, Map2>::value.
Add text in changes.html.
 2013-06-24 10:27:26 +02:00
Guillaume Damiand 37d7b8ef0f Merge branch 'Combinatorial_map-reverse_orientation-kenohori-old' into Combinatorial_map-reverse_orientation-kenohori 2013-06-23 21:02:11 +02:00
Guillaume Damiand 1018501173 Replace t.get<i>() by CGAL::cpp11::get<i>(t) for tuples. 2013-06-18 09:33:37 +02:00
Guillaume Damiand 867cf4767e Example for dynamic functor. 2013-06-17 10:14:04 +02:00
Guillaume Damiand 444ba939a8 Dynamic attributes for onmerge and onsplit. 
Copy of master, and integrations of modifs done in the branch Combinatorial_map_dynamic_onxxxfunctors-gdamiand. Add an example in  map_3_dynamic_onmerge.cpp.
 2013-06-16 20:48:01 +02:00
Guillaume Damiand 50fd54b5f1 Patch for compiler gcc4.3 
(Sebastien is the best, even it is not fair because I don't have access to the compiler. But I will pay my beer ;)
 2013-06-13 14:53:04 +02:00
Guillaume Damiand 7f7788bd84 Small corrections on reverse orientations; reformating; start to add tests 2013-06-13 11:14:03 +02:00
Guillaume Damiand 67756fd5d3 Add missing template keywords 2013-06-13 10:21:09 +02:00
Guillaume Damiand ff8b4686d9 Remove a warning 2013-06-07 08:46:25 +02:00
Guillaume Damiand 23e8a540f7 Small corrections after first results of testsuite 2013-06-06 08:18:13 +02:00
Guillaume Damiand a4e392b552 Copy of CMap: ok for code and test suite. 2013-06-05 16:16:02 +02:00
Guillaume Damiand 035ff356b6 Better solution for lcc copy 2013-06-04 18:27:13 +02:00
Guillaume Damiand 6e7babc14b copy cont 2013-06-04 13:23:43 +02:00
Guillaume Damiand 6cc05e3920 wip copy 2013-06-03 18:50:35 +02:00