Commit Graph

797 Commits

Author SHA1 Message Date
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
2015-07-17 15:39:18 +02:00
Sébastien Loriot 2668d83d4e Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin'
Add an algorithm to fit geometric primitives on a point set

Conflicts:
	Installation/changes.html
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-07-17 14:32:09 +02:00
Sébastien Loriot 50595505c4 Merge branch 'Fix_warnings-GF'
Fixes warnings in various packages

Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
2015-07-17 14:21:21 +02:00
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
2015-07-17 14:13:37 +02:00
Laurent Rineau 25df59411d Merge branch 'releases/CGAL-4.6-branch'
Fix a miscompilation by clang-3.6.x

  https://github.com/CGAL/cgal/pull/161
2015-07-15 17:02:02 +02:00
Sébastien Loriot d26e112cf4 fix warnings 2015-07-15 16:57:38 +02:00
Laurent Rineau 17857e15d3 Same patch for <CGAL/Concurrent_compact_container.h>
Patch similar to the previous commit.
2015-07-15 11:33:51 +02:00
Laurent Rineau c774546e1b A better fix, using operator->() 2015-07-14 18:02:40 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Andreas Fabri 2dea6db3bb Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF
Conflicts:
	Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
2015-07-06 10:51:23 +02:00
Laurent Rineau 2591e6cc7d Fix a miscompilation by clang-3.6.x
Fix issue #139
2015-07-03 17:28:11 +02:00
Andreas Fabri c48bf3a3e6 more tests; small fixes 2015-06-25 09:17:08 +02:00
Guillaume Damiand d67542fb59 Add is_xxx_used in cmap for dart and attributes; add tests in CMap and LCC. 2015-06-22 16:50:56 +02:00
Andreas Fabri 92a647b1af add example for unordered_set 2015-06-22 12:31:48 +02:00
Guillaume Damiand a0b569b83d Remove asserts that avoir to increment/decrement iterators on removed elements. 2015-06-17 09:51:20 +02:00
Guillaume Damiand a423368960 Add also is_used in Concurrent_compact_container to be consistent 2015-06-16 19:48:01 +02:00
Guillaume Damiand 25e28a9cf0 Add is_used function (in code and doc) 2015-06-16 12:29:59 +02:00
Clement Jamin 1097079153 Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin 2015-06-12 16:04:59 +02:00
Andreas Fabri dadb129147 g++ needs a forward declaration for std::hash 2015-06-02 08:46:20 +02:00
Andreas Fabri b6850d35c0 #include <functional> and suppress struct/class warning for VC10 2015-06-01 10:42:52 +02:00
Andreas Fabri a58e024788 Fix dependencies. Add links to std/boost::unordered_.. 2015-05-28 09:15:37 +02:00
Andreas Fabri cf058cba9c do not use hash of pointers so that our specializations for handles are injective 2015-05-27 17:02:00 +02:00
Andreas Fabri ed352f5f37 Projection_object -> ProjectionObject 2015-05-27 16:30:57 +02:00
Andreas Fabri b5dba6efd9 rename file 2015-05-27 16:28:47 +02:00
Andreas Fabri 425cdf0b0c derive from unary_function; Add #define switch to hash underlying pointer 2015-05-27 12:19:55 +02:00
Andreas Fabri 4a9da36404 Add concept Hashable 2015-05-27 11:33:25 +02:00
Andreas Fabri 8c20bd91c2 Replace CGAL::get() with CGAL::get_pointee_or_identity() and remove using get:: 2015-05-13 16:18:31 +02:00
Andreas Fabri b7f9849599 Replace CGAL::get() with CGAL::get_pointee_or_identity() and remove using get:: 2015-04-30 11:31:21 +02:00
Sébastien Loriot 5006193a57 add missing size() function 2015-04-29 15:18:54 +02:00
Andreas Fabri 6f42513e58 divide by sizeof(pointee) for Compact_container 2015-04-27 13:44:18 +02:00
Andreas Fabri 79459e8fb8 remove free functions in Iterator_range 2015-04-21 11:57:45 +02:00
Andreas Fabri d74567a177 WIP 2015-04-20 16:11:08 +02:00
Andreas Fabri 89b4f37411 divide by sizeof(pointee) in the hash 2015-04-20 14:32:52 +02:00
Andreas Fabri 0c2a568d73 better coverage of the combinations of mesh and map classes 2015-04-20 10:40:03 +02:00
Sébastien Loriot d36593eb72 add missing const and remove debug output 2015-04-17 17:22:26 +02:00
Andreas Fabri 832208d815 simplifications 2015-04-17 15:49:21 +02:00
Andreas Fabri 205a594a77 add specializations of hash and add tests 2015-04-17 10:21:14 +02:00
Andreas Fabri c2871c92e6 Move the Index class back into Suface_mesh; Add doc 2015-04-15 19:15:34 +02:00
Andreas Fabri 962ef07812 Add hash_value for Compact_container, Inplace_list, Index 2015-03-12 16:21:56 +01:00
Sébastien Loriot d2071887fb remove \, 2015-01-31 16:15:40 +01:00
Andreas Fabri cc4192a628 Merge branch 'Surface_mesh-fixes-GF'
Approved by the release manager

Conflicts:
	STL_Extension/include/CGAL/Iterator_range.h
2015-01-26 16:54:03 +01:00
Andreas Fabri 8e801bbc80 no need to use boost::range_iterator 2015-01-19 09:00:21 +01:00
Andreas Fabri 06cc350143 include a boost header instead of a forward declaration as the number of template arguments changed 2015-01-16 09:54:34 +01:00
Laurent Rineau beda93fd8e The declaration of boost::range has changed
Use the header <boost/range.hpp>, instead of a forward declaration.
2015-01-13 15:34:02 +01:00
Andreas Fabri 2cee9fc33e Merge branch 'CGAL-misc_warnings-GF'
Approved by the release manager
2015-01-12 13:00:41 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Andreas Fabri b8ef643b60 use CGAL_USE_TYPE 2015-01-08 10:33:50 +01:00
Andreas Fabri 1aeb8974f4 capitalize file name (step 2, as I am on Windows) 2014-12-31 14:11:08 +01:00
Andreas Fabri 9964db2b9a capitalize file name (step 1, as I am on Windows) 2014-12-31 14:10:52 +01:00