Commit Graph

36 Commits

Author SHA1 Message Date
Sébastien Loriot c09ec2beaa Merge branch 'Kernel-replace_object-pmoeller'
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager

Conflicts:
	Kernel_23/doc/Kernel_23/CGAL/intersections.h
	Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
	Kernel_d/doc/Kernel_d/Kernel_d.txt
	STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-06-14 14:26:05 +02:00
Monique Teillaud 6c4357eb2f doc bug fix (following a question by a user on cgal-discuss)
same as 2d8f2caf54
2013-06-03 09:06:08 +02:00
Sébastien Loriot 12e8f44d0f fix doc-tex doc 2013-05-22 08:35:50 +02:00
Sébastien Loriot f97d6b8bd9 s/boost::result_of/cpp11::result_of/g 2013-03-14 10:38:13 +01:00
Philipp Möller d198458ca7 Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
Conflicts:
	.gitattributes
	AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
	AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
	AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
	AABB_tree/include/CGAL/AABB_traits.h
	AABB_tree/include/CGAL/AABB_tree.h
	AABB_tree/test/AABB_tree/AABB_test_util.h
	Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
	Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
	Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
	Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
	Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
	Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
	Filtered_kernel/include/CGAL/Lazy.h
	Filtered_kernel/include/CGAL/Lazy_kernel.h
	Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
	Intersections_2/test/Intersections_2/test_intersections_2.cpp
	Intersections_3/test/Intersections_3/test_intersections_3.cpp
	Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
	Kernel_23/include/CGAL/Kernel/Type_mapper.h
	Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
Philipp Möller d1c531a12b Fixed a few stray Result templates to result_of. 2012-05-07 09:16:26 +00:00
Philipp Möller ab9afd78e0 incorporated Michael Hoffmann's review 2 2012-05-02 12:12:37 +00:00
Sébastien Loriot aad2dfdde0 doc bug fix:
In the doc page of Intersect_2, intersection for Iso_rectangle_2 and Triangle_2
is documented while in the doc page of intersection, it is not
(and all is implemented).
2012-05-02 10:27:45 +00:00
Sébastien Loriot a521599052 sort 2D intersection primitive lexicographically (like I done in 3D) 2012-05-02 10:22:28 +00:00
Philipp Möller 9bb495b4bd Add links to result_of to concerned "see also". 2012-04-24 17:05:01 +00:00
Philipp Möller b6a4607ece Removed mentioning of the Intersect metafunction. Switched everything
to the yet unimplemented boost::result_of.
2012-04-24 16:17:26 +00:00
Philipp Möller d3459ef740 * prettified and included the example 2012-02-06 10:24:52 +00:00
Philipp Möller cc936f0c79 * added a paragraph on how to upgrade code
* fixed syntax error
2012-01-18 10:23:40 +00:00
Philipp Möller d117004557 Used auto in the examples 2012-01-16 11:26:46 +00:00
Philipp Möller 1be7dd9cd4 Incorporated reviewer comments 2012-01-16 10:54:46 +00:00
Philipp Möller 26a94ab6bb Small documentation corrections 2011-11-24 10:44:23 +00:00
Philipp Möller 18c85a8da5 fixed the links 2011-11-16 15:38:30 +00:00
Philipp Möller 94affd589d Moved the Intersection_result concept into the functors and adapted code in the lazy kernel to that change. 2011-11-15 15:40:22 +00:00
Philipp Möller 9051768cea Introduced Intersection_results as a Kernel concept for use in public APIs in favor over Intersection_traits. 2011-11-15 13:41:14 +00:00
Philipp Möller 4e5c36d460 Documentation refreshed and CGAL_INTERSECTION_VERSION added 2011-11-14 09:54:20 +00:00
Philipp Möller 8d92f10f23 documented said hack, needs fixing 2011-08-25 21:47:06 +00:00
Philipp Möller a79bcb9e57 Deprecating of Object concept, documentation 2011-08-25 16:11:47 +00:00
Philipp Möller 03caf9fe95 New documentation for intersections in Kernel_23 and Kernel_d, removed old IT2/3, documentation
for overload, added examples for overload and dispatch_outputiterator
2011-08-25 14:02:05 +00:00
Philipp Möller d5352c3101 Ray_3 Ray_3 intersections can also return Segment_3 2011-07-15 14:17:20 +00:00
Sébastien Loriot b5be50cc80 typo 2011-07-13 16:37:37 +00:00
Sébastien Loriot 93f9acba26 missing return type in html version only 2011-05-12 13:17:08 +00:00
Sébastien Loriot 182ca2b410 update manual for intersection primitives to account for
Ray_3 vs {Ray_3,Segment_3 and Line_3}

Update the table for CGAL::intersection and make it sorted for dimension 3
(this time I also updated the html part)
2010-10-29 09:02:09 +00:00
Sébastien Loriot 663099d82d add intersection Triangle_3,Triangle_3
add intersection Plane_3,Triangle_3
update documentation (also for Segment_3,Line_3 and Segment_3,Segment_3)
2010-08-31 13:42:40 +00:00
Stéphane Tayeb ac291ebfab * add documentation for do_intersect(Bbox,Bbox/Line/Ray/Seg) and intersection(Triangle,Line/Ray/Seg)
NB: Todo - change history.tex
2009-12-18 15:26:35 +00:00
Laurent Rineau 2bf7e2ccce Merge from the CGAL-3.4 branch:
New Revision: 47768
 Author: lrineau
 Date: 2009-01-20 23:19:01 +0100 (Tue, 20 Jan 2009)
 
 Log message:
 
Fix wrong cross-linking in the manual, using new optional argument of \ccc
and \ccRefIdfierPage.
2009-01-20 22:37:16 +00:00
Monique Teillaud 0a21c25e37 bug fix 2008-11-06 15:13:16 +00:00
Monique Teillaud 0ec24cd91a - bug fix: missing do_intersect(Circle_2,Circle_2) added in Kernel_23
- added do_intersect and intersect coming from CK2 and SK3
2008-09-01 09:14:12 +00:00
Sylvain Pion aec07c1fe2 Use object_cast instead of assign in the example 2008-07-29 12:01:35 +00:00
Monique Teillaud b1ef678231 - integration in Kernel of various functionality for lines, planes, spheres
- addition of Circle_3 and related functionality
(all this comes from the spherical kernel package)

(the manual test-suite won't pass because of errors in the ambient
dimension stuff)
2008-06-03 13:13:46 +00:00
Andreas Meyer 7ed1a00c04 merge manual fixed from 3.3 branch back intro trunk:
svn merge -r 38751:38754 ~/projects/CGAL/branches/CGAL-3.3-branch
svn merge -r 38773:38775 ~/projects/CGAL/branches/CGAL-3.3-branch
svn merge -r 38783:38784 ~/projects/CGAL/branches/CGAL-3.3-branch
svn merge -r 38795:38796 ~/projects/CGAL/branches/CGAL-3.3-branch
svn merge -r 38815:38816 ~/projects/CGAL/branches/CGAL-3.3-branch
svn merge -r 38827:38829 ~/projects/CGAL/branches/CGAL-3.3-branch
svn merge -r 38834:38836 ~/projects/CGAL/branches/CGAL-3.3-branch
2007-05-28 23:05:00 +00:00
Laurent Saboret a0a9b777bc Move packages to trunk root 2006-02-14 08:58:16 +00:00