Commit Graph

255 Commits

Author SHA1 Message Date
Sébastien Loriot 83d8a9578b avoid compilation loop when using a decltype based implementation of result_of
same fix as CK2
As expected the Spherical_kernel with  Lazy_kernel no longer
compiles. I'll fix it.
2013-03-15 18:35:50 +01:00
Sébastien Loriot 14429d2b8e fix compilation errors 2013-03-14 18:32:14 +01:00
Sébastien Loriot f97d6b8bd9 s/boost::result_of/cpp11::result_of/g 2013-03-14 10:38:13 +01:00
Sébastien Loriot d6905c61be Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
Conflicts:
	AABB_tree/include/CGAL/AABB_tree.h
	Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
	Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
	Kernel_23/doc/Kernel_23/CGAL/intersections.h
	Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
	STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-03-14 10:29:31 +01:00
Sébastien Loriot f0f34d45fa workaround to force the usage of the tr1 implementation of result_of from boost
see http://www.boost.org/doc/libs/1_52_0/libs/utility/utility.htm#result_of
2013-02-04 11:30:28 +01:00
Philipp Möller 03151d7bb7 intersection_return now also uses result_of 2012-12-10 17:20:36 +01:00
Philipp Möller 05115c91ce fixup move 2012-12-10 17:20:15 +01:00
Philipp Möller 81b8604c76 Move Circular intersection results from the traits to result_of 2012-12-10 15:56:09 +01:00
Philipp Möller 9d4d5e6e7d Replace Intersection_traits with result_of 2012-12-07 18:00:47 +01:00
Philipp Möller 542b0df6cf Actually call SK::Linear_intersect and enable_if the most general case 2012-12-07 18:00:47 +01:00
Philipp Möller 72f1df9aa0 Fix the result struct of SK::Intersect_3
Also don't use inheritance to get functionality from the linear kernel
but forward.
2012-12-07 18:00:47 +01:00
Philipp Möller c4583082d2 Add missing typedefs 2012-12-07 18:00:46 +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 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Laurent Rineau 4c3e1c3138 Fix mixed eol styles 2012-08-02 13:35:03 +00:00
Marc Glisse a758751485 Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled). 2012-07-28 06:21:06 +00:00
Philipp Möller 17797b7271 Merge next into this branch. There have been conflicts in the
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.

The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
2012-04-24 15:06:19 +00:00
Philipp Möller 542f5d9c51 Merged ^/branches/next here 2012-04-16 08:53:21 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Philipp Möller 5b5827839b * removed cruft from lazy
* Circular_kernel_3 fixed by removing inheritance
2011-11-25 11:20:34 +00:00
Philipp Möller 0e0a200646 * Using result_of instead of Qualified_result_of
* limited refactoring in the lazy kernel
* still bugs in circular_3
* still specialization problem with iso_rectangle
2011-11-23 17:52:38 +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 450f438518 IT shortcut not circumvents specifying a kernel making it an actual shortcut and nicer for exposure in APIs 2011-11-10 11:06:26 +00:00
Philipp Möller a4e6d57cff Circular_kernel_2 and Circular_kernel_3 now use CGAL_INTERSECTION_VERSION for backwards compatability 2011-11-09 14:29:46 +00:00
Philipp Möller 875bde1083 Added support to Lazy kernel for constructions that return Object, fixed a bug in Line_arc_3 - Line_arc_3 intersections 2011-11-07 15:38:49 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Philipp Möller b07e2df018 * Circular_kernel is now Object free, doesn't compile with Lazy yet,
* hack for ternary function
2011-08-25 21:40:12 +00:00
Sébastien Loriot 83875b9cc1 use make_sqrt instead of make_root_of_2 2011-05-05 14:34:36 +00:00
Sébastien Loriot d5c2355419 merge the modification from experimental packages to
the candidate branch of the feature + few name bug fixes
2011-04-12 11:34:37 +00:00
Sébastien Loriot e5a96255ba *remove warnings.
In particular remove UNTESTED_XXXXXXXXXXX unused variable that possibly hide true warnings. 
In those cases, the string printed while executed now starts with "NOTE: ".
*CGAL internal code no longer rely on depecrated features
2011-02-28 15:28:28 +00:00
Sébastien Loriot d12d8eb3bf missing include file 2010-06-16 17:24:58 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Laurent Rineau 67928706cf C++ conformance: calls to member templates of dependent names must be
qualified with the "template" keyword.

Example:
  template <typenam T>
  void f(T foobar) {
    foobar.get<0>().foobar(); // error
  }
must be written:

  foobar.template get<0>().foobar();
2010-05-16 16:50:24 +00:00
Sébastien Loriot 8eab88c475 remove deprecated TODO 2010-05-10 07:15:28 +00:00
Sébastien Loriot bdad265446 forgot to commit changes 2010-05-06 12:46:10 +00:00
Sébastien Loriot 0a7fa389e5 remove warnings 2010-01-19 07:41:16 +00:00
Sébastien Loriot 2c90de93ed New demo for CK3 using libQGLviewer 2010-01-18 15:04:21 +00:00
Laurent Rineau 83912b2952 Massive fix of svn:keywords properties, and $URL$ keyword. 2009-10-20 08:59:26 +00:00
Sylvain Pion 8573fe26ce Rename CGALi to internal. 2009-08-24 17:10:04 +00:00
Sylvain Pion 927b432b39 typo : mecanism -> mechanism. 2009-08-10 15:57:03 +00:00
Sébastien Loriot 0f9df424db remove variable name ES that seems to be catch by g++4.3.3CentOS 2009-07-28 14:22:35 +00:00
Sébastien Loriot 46c843db63 add myself as author in CK3 files 2009-07-21 09:08:07 +00:00
Sébastien Loriot 9ea0b3c43e assign -> object_cast : remove warning "uninitialized variable" 2009-07-09 11:05:10 +00:00
Sébastien Loriot 5cef2446c4 remove warning conversion from float to unsigned (approved by RM) 2009-07-09 08:18:16 +00:00
Sébastien Loriot 962a85ac6a add CGAL_NTS before sign (bug in CORE, convertion from int to Sign) 2009-07-08 13:37:55 +00:00
Sébastien Loriot 4f57133432 truncf --> floor 2009-07-02 06:36:30 +00:00
Sébastien Loriot ae2a914f0e bug in Intersect_3, missing Outputiterator 2009-07-01 14:35:40 +00:00
Sébastien Loriot a3cbbb4024 add macro for overloaded functor from linear kernel 2009-06-30 07:29:54 +00:00
Sébastien Loriot 48080deda7 move modifs from exp package to trunk 2009-06-24 16:58:20 +00:00
Pedro Machado Manhaes de Castro 9885387aad removing trash 2009-03-31 15:43:42 +00:00
Pedro Machado Manhaes de Castro 867287b000 Major bug fix on the has_on function of a Circular_arc (thanks to Sebastien) 2008-12-09 13:32:48 +00:00
Andreas Fabri 6701257f6c Forward orientation 2008-12-08 14:45:22 +00:00
Andreas Fabri 7acc06fb68 fix bug in Sphere_3 constructor in the VC++ workaround 2008-12-07 21:11:04 +00:00
Andreas Fabri e66df2fe73 forwarding calls as 'using' them doesn't work for VC8 2008-12-05 16:36:43 +00:00
Andreas Fabri efbd90eb3a More forward operator calls from circular to linear functor for VC++ 2008-12-03 15:22:22 +00:00
Andreas Fabri 578d650272 forward operator calls from circular to linear functor for VC++ 2008-12-03 10:00:17 +00:00
Pedro Machado Manhaes de Castro ea61aa9fbd avoid ambiguity 2008-11-10 13:53:16 +00:00
Pedro Machado Manhaes de Castro f1bd30929d small fix on ambiguity 2008-11-10 13:50:56 +00:00
Andreas Fabri d84c498c02 Remove second typedef for result_type 2008-10-21 12:33:21 +00:00
Pedro Machado Manhaes de Castro 183968ef03 function<SK>(...) to SphericalFunctors::function<SK>(...) 2008-10-13 18:26:48 +00:00
Sylvain Pion 4aa1cb057a Remove my email adress from header files. 2008-10-11 20:21:08 +00:00
Pedro Machado Manhaes de Castro e257c6cef2 global functions compare_{x,y,z,xy,xyz} for CK3 2008-10-03 11:56:42 +00:00
Pedro Machado Manhaes de Castro 24de52a1cf <, >, <=, >= operations for Circular_arc_point_3 2008-10-02 15:39:30 +00:00
Pedro Machado Manhaes de Castro aa98655ae8 Line comment Not Documented 2008-10-02 15:15:17 +00:00
Pedro Machado Manhaes de Castro 5b352e3d2e circular -> spherical 2008-10-02 14:40:12 +00:00
Pedro Machado Manhaes de Castro d7397475da global_functions_spherical_kernel <- global_functions_circular_kernel 2008-10-02 14:39:28 +00:00
Pedro Machado Manhaes de Castro add980ff77 global_functions: {x,y,z}_extremal_points and removing some Circle_3 stuffs 2008-10-02 11:41:47 +00:00
Pedro Machado Manhaes de Castro e00793b412 Circle_3 is inside the kernel 2008-10-01 15:37:42 +00:00
Pedro Machado Manhaes de Castro 88b210b4ac global functions in a single file 2008-10-01 15:36:16 +00:00
Pedro Machado Manhaes de Castro 338f5881c0 Global functions in a single file 2008-10-01 15:34:45 +00:00
Pedro Machado Manhaes de Castro 1c046e08e8 Circle_3 is on kernel now 2008-10-01 14:06:51 +00:00
Pedro Machado Manhaes de Castro 887709711b Delete the do_overlap operator() when the answer is automatically false 2008-10-01 14:03:34 +00:00
Pedro Machado Manhaes de Castro f82cea44c7 Delete the has_on operator() when the answer is automatically false 2008-10-01 13:54:27 +00:00
Pedro Machado Manhaes de Castro 86b6640fc4 Circle_3 is on the kernel now, dont need an equal_3 operator 2008-10-01 13:44:46 +00:00
Pedro Machado Manhaes de Castro 4f9d341731 removing unnecessary constructors on Line_arc_3 and add the Line_arc_3(Point_3, Point_3) constructor 2008-10-01 13:19:35 +00:00
Pedro Machado Manhaes de Castro acf6c397a5 Construct_diametral_sphere => Construct_sphere in SK3 2008-09-16 13:21:57 +00:00
Pedro Machado Manhaes de Castro 031d752c8d identation 2008-09-16 12:27:12 +00:00
Monique Teillaud beceafe179 indentation 2008-09-16 09:14:13 +00:00
Pedro Machado Manhaes de Castro 2040ef0817 Construct_supporting_{X} to Construct_X 2008-09-15 18:58:21 +00:00
Pedro Machado Manhaes de Castro 9cf4e0eff9 Construct_supporting_line_3 => Construct_line_3 2008-09-15 13:24:51 +00:00
Pedro Machado Manhaes de Castro 53b9f349d6 an operator == missing 2008-09-12 20:06:58 +00:00
Pedro Machado Manhaes de Castro 8decf385a1 Example with a functor + adding a constructor Circular_arc_3(Point_3, Point_3, Point_3) 2008-09-12 16:58:21 +00:00
Monique Teillaud c7dcfee4f0 global functions moved to a documentable place 2008-08-28 12:55:38 +00:00
Pedro Machado Manhaes de Castro 7489f73f53 Do_intersection + global_functions + making the example easier for the user 2008-07-25 18:20:49 +00:00
Sylvain Pion c71a0233bb Replace CGAL::Triple by boost::tuple. 2008-07-25 15:03:29 +00:00
Pedro Machado Manhaes de Castro 285600fe63 result_type inheritance 2008-07-24 14:40:44 +00:00
Pedro Machado Manhaes de Castro 65e7bd6974 Cleaning stuffs temporarily 2008-07-24 13:13:12 +00:00
Pedro Machado Manhaes de Castro e3a9115e66 License CK3 2008-07-24 09:26:28 +00:00
Sylvain Pion 79864c0c8e Remove Arity_tag. 2008-07-22 12:29:01 +00:00
Pedro Machado Manhaes de Castro 590884f915 Changing Licenses from QPL to LGPL (remaining ones) 2008-07-17 12:17:17 +00:00
Pedro Machado Manhaes de Castro 66b2705068 Changing Licenses from QPL to LGPL 2008-07-17 12:02:29 +00:00
Pedro Machado Manhaes de Castro 33185f3b7c Fixing some not welcome overloaded function 2008-06-13 16:52:27 +00:00
Pedro Machado Manhaes de Castro bcffed1653 Need to preserve an internal representation of Cirle_3, so reference sphere's stuff keep working. 2008-06-05 09:25:17 +00:00
Pedro Machado Manhaes de Castro b8a1681800 Fixing Circular_kernel_3 2008-06-05 09:22:51 +00:00
Pedro Machado Manhaes de Castro 9896cccd30 Cleaning 2008-06-04 11:40:02 +00:00
Pedro Machado Manhaes de Castro 9653f7ffbe Cleaning stuffs 2008-06-03 13:13:09 +00:00
Pedro Machado Manhaes de Castro 2b4880d5b1 Modif because of the Circular_kernel_3 -> Kernel_23 stuffs 2008-06-03 12:53:56 +00:00
Sébastien Loriot 159c7af818 Modif for Arrangement on surface: circle arcs
Small include bug
2008-05-19 10:01:59 +00:00
Andreas Fabri 8d2eb901ea Replaced char with bool 2008-04-29 13:10:23 +00:00